Merge "Remove ARCH_X86."