Merge "Remove more always-true ARCH_ARM_HAVE_ flags."