Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e
am: 7baefbc0d4

Change-Id: I4c3ec234d252abc64c1f35afc87c03fbaaeea7d2