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

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