am 1d345ecd: am 81c23f3c: Merge "Use __arm__ instead of ARCH_ARM."

* commit '1d345ecd95be52a7ad0766424402c3cf1726fbee':
  Use __arm__ instead of ARCH_ARM.