am e57c8446: Merge "Switch x86 to uapi headers."
am e57c8446: Merge "Switch x86 to uapi headers."

* commit 'e57c8446f0fa8e02b27e0b77aee7a2b62784cc54':
  Switch x86 to uapi headers.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build