Merge "Declare explicitly thumb mode." am: 01ba2e6ed6 am: 79829a764f
am: 7e56c8eeb0

Change-Id: Ice73848e2a83bc7ad7bb11dde80cfd77f5f9e70c