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