Merge "Hide CFI behind a global flag." am: c0bf85a615 am: 1bd8984ace
am: 085a015abb

Change-Id: I4b5deed6eb0b3f3ad0cde1ea78f299f0e34db0c6