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

Change-Id: I67e0e31574dc18fd6a9daa5419246cc55d3db442