am 9658bda3: Merge "Remove ARCH_ARM."
am 9658bda3: Merge "Remove ARCH_ARM."

* commit '9658bda351e8e9226181b411eeb14b5cc3618471':
  Remove ARCH_ARM.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build