Merge "Switch x86_64 over to uapi headers."