Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"