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

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