There is no point to trivial cleanups in external headers.

Change-Id: I9cb7ba135655e1426dcafd3a621ab4eaa7da1011