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

Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb