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

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