Merge "Match the arm/arm64 style in the x86/x86-64 files."