Merge "ndk: x86: Update android-9 x86 platform files"