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

Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f