diff --git a/cc/config/clang.go b/cc/config/clang.go
index 302c68ee4..004840ad4 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -148,6 +148,19 @@ func init() {
 		// fixed.
 		//"-Werror=null-dereference",
 		"-Werror=return-type",
+
+		// http://b/72331526 Disable -Wtautological-* until the instances detected by these
+		// new warnings are fixed.
+		"-Wno-error=tautological-constant-compare",
+
+		// http://b/72331524 Allow null pointer arithmetic until the instances detected by
+		// this new warning are fixed.
+		"-Wno-error=null-pointer-arithmetic",
+
+		// http://b/72330874 Disable -Wenum-compare until the instances detected by this new
+		// warning are fixed.
+		"-Wno-error=enum-compare",
+		"-Wno-error=enum-compare-switch",
 	}, " "))
 }
 
diff --git a/cc/config/global.go b/cc/config/global.go
index 37848247b..55ae9e369 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -116,8 +116,8 @@ var (
 
 	// prebuilts/clang default settings.
 	ClangDefaultBase         = "prebuilts/clang/host"
-	ClangDefaultVersion      = "clang-4393122"
-	ClangDefaultShortVersion = "5.0.1"
+	ClangDefaultVersion      = "clang-4579689"
+	ClangDefaultShortVersion = "6.0.1"
 
 	// Directories with warnings from Android.bp files.
 	WarningAllowedProjects = []string{