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

Change-Id: I9a586f57a8988bdb8d772705acef8f5f8b967e8d