Merge "Switch x86 to uapi headers."