Merge "Remove ARCH_ARM."