Merge "Use __arm__ instead of ARCH_ARM."