Merge "Change the global CFI flag to default to enabled." am: eddf74cadb
am: 69a345338a

Change-Id: Ic67b7e76b5a4ee8b3342ef020d0c5cd16318a70e