am f8c5a6ae: am bd10e2c0: Merge "Switch x86_64 over to uapi headers."

* commit 'f8c5a6ae006cfa8a6e30b850cbf930a043e5e842':
  Switch x86_64 over to uapi headers.