Merge "Switch x86 over to uapi-only."