am f04cd27b: am 47cf461b: Merge "Proper fix for issue 20051601 - arm actually means thumb2."

* commit 'f04cd27b08f24a797696fb1a244e6a7ff77fcb84':
  Proper fix for issue 20051601 - arm actually means thumb2.