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

Change-Id: I7818132caaa831fff72f870db26559e26667311f