Merge "build: use correct arm vs thumb arguments for 2nd arch builds"