am ec81b4a3: Merge "Scrub uapi headers slightly harder."

* commit 'ec81b4a380e1bbbaf6e582cd28476a245694abe7':
  Scrub uapi headers slightly harder.