am 1d979954: am 5d610bfe: am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"

* commit '1d97995429744e016d0f8296380c85c1167c51c2':
  Refresh development/ndk/platforms/android-9/arch-x86/include/machine