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

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