Merge "Force Thumb for CFI targets."
am: 34eb9f7f60

Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b