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

Change-Id: I1d854bb525be09926890da631ecfe77a7fb3413c