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

Change-Id: I45ee0c70c776576604fdf554a932574d1893bea9