Merge "Disble CFI for ARM32 processes." am: e13374d3c1

am: 9639d3b72c

Change-Id: Ia4ffc01104f56f526c8a0e2ce73d7892640b2983

cc/sanitize.go

@@ -173,6 +173,12 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
 		s.Diag.Cfi = nil
 	}
 
+	// Also disable CFI for arm32 until b/35157333 is fixed.
+	if ctx.Arch().ArchType == android.Arm {
+		s.Cfi = nil
+		s.Diag.Cfi = nil
+	}
+
 	if ctx.staticBinary() {
 		s.Address = nil
 		s.Coverage = nil