Merge "Change the global CFI flag to default to enabled." am: 45fd769588 am: 6e790c6a49
am: ee5e53ccc5

Change-Id: I11f7a72d18b8446e88c66659dfe69c3496b586cd