Merge "Change the global CFI flag to default to enabled." am: 9ce4529614 am: 848558ec1f

am: 2a91b550e6

Change-Id: I47f2768de87cd715519b28ea2ad69dd05f0cfebb

android/config.go

@@ -406,7 +406,11 @@ func (c *config) SanitizeDeviceArch() []string {
 }
 
 func (c *config) EnableCFI() bool {
-	return Bool(c.ProductVariables.EnableCFI)
+	if c.ProductVariables.EnableCFI == nil {
+		return true
+	} else {
+		return *c.ProductVariables.EnableCFI
+	}
 }
 
 func (c *config) Android64() bool {