Updates from make

Contains equivalent changes for:

  561b4c1 Set mcpu targets based on cpu variant.
  6a66a88 Stop encoding absolute paths in symbols
  63e3b02 Enable color output from gcc and clang
  eb3e3fa Use exported includes for libc++.
  3a0a891 Link libgtest_main before libgtest

Change-Id: I45a06c02e9af1d40f0c52f1e6a20d6cd382a27fb
diff --git a/cc/arm_device.go b/cc/arm_device.go
index 15f0913..ce8a1cb 100644
--- a/cc/arm_device.go
+++ b/cc/arm_device.go
@@ -199,12 +199,14 @@
 	}
 
 	armCpuVariantCflagsVar = map[string]string{
-		"":           "",
-		"cortex-a7":  "${armCortexA7Cflags}",
-		"cortex-a8":  "${armCortexA8Cflags}",
-		"cortex-a15": "${armCortexA15Cflags}",
-		"krait":      "${armCortexA15Cflags}",
-		"denver":     "${armCortexA15Cflags}",
+		"":               "",
+		"cortex-a7":      "${armCortexA7Cflags}",
+		"cortex-a8":      "${armCortexA8Cflags}",
+		"cortex-a15":     "${armCortexA15Cflags}",
+		"cortex-a53":     "${armCortexA7Cflags}",
+		"cortex-a53.a57": "${armCortexA7Cflags}",
+		"krait":          "${armCortexA15Cflags}",
+		"denver":         "${armCortexA15Cflags}",
 	}
 
 	armClangArchVariantCflagsVar = map[string]string{
@@ -214,12 +216,14 @@
 	}
 
 	armClangCpuVariantCflagsVar = map[string]string{
-		"":           "",
-		"cortex-a7":  "${armClangCortexA7Cflags}",
-		"cortex-a8":  "${armClangCortexA8Cflags}",
-		"cortex-a15": "${armClangCortexA15Cflags}",
-		"krait":      "${armClangKraitCflags}",
-		"denver":     "${armClangCortexA15Cflags}",
+		"":               "",
+		"cortex-a7":      "${armClangCortexA7Cflags}",
+		"cortex-a8":      "${armClangCortexA8Cflags}",
+		"cortex-a15":     "${armClangCortexA15Cflags}",
+		"cortex-a53":     "${armClangCortexA7Cflags}",
+		"cortex-a53.a57": "${armClangCortexA7Cflags}",
+		"krait":          "${armClangKraitCflags}",
+		"denver":         "${armClangCortexA15Cflags}",
 	}
 )