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

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