am 402b02f8: Merge "ndk: x86: Update android-9 x86 platform files"

* commit '402b02f8ecbbed55539ee6afd6141bcaad1cc7c3':
  ndk: x86: Update android-9 x86 platform files