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

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