am b257bb8a: am e9c7386b: am e011bed4: Merge "ndk: x86: Sanitize platform headers and libraries."

* commit 'b257bb8ab4a18e6683aec64389305e179f6eb86b':
  ndk: x86: Sanitize platform headers and libraries.