am a49b7fed: am cfe75518: (-s ours) am 9b2b0527: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"

* commit 'a49b7fed9189a6fbbe3793ef1dfcefd78e30cbf1':
  Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm