am 38b14290: am 66153e38: Merge "Switch x86 over to uapi-only."

* commit '38b14290ea45d410969df9f62f5b39787586ca3a':
  Switch x86 over to uapi-only.