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

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