Merge "Hide CFI behind a global flag."
am: c0bf85a615

Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8