Merge "Force Thumb for CFI targets." am: 34eb9f7f60 am: 9e8e3de9d8 am: 682a87a7f5
am: 999ea7f160

Change-Id: I84f7f7107c8166f93ffe3c47d2743b6c7e427e2f