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

Change-Id: I23a89021e5cb21e181bd529a1a854d204231e5c6