am 9b2b0527: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"

* commit '9b2b0527ccbc00e2befa2b8554a7e045f5168203':
  Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm