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

Change-Id: I1f954ebfd9b948a554f994840bce7e33563219b3