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

Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f