Merge "EM_ARM and EM_AARCH64 are now in the uapi header."