am 81ea7ed4: am f34c4c71: am 125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
am 81ea7ed4: am f34c4c71: am 125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"

* commit '81ea7ed4625f461cfd9b08a426b4b85e2718039c':
  build: use correct arm vs thumb arguments for 2nd arch builds

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