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

* commit '81c23f3cfe64fc63bf7e5fadf86d08f44d5306df':
  Use __arm__ instead of ARCH_ARM.