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

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