Merge "Stubs variant is used when building for APEX"
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 0f22034..89e567d 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -185,9 +185,6 @@
 		"-Wno-c++98-compat-extra-semi",
 
 		// Disable this warning until we can fix all instances where it fails.
-		"-Wno-self-assign-overloaded",
-
-		// Disable this warning until we can fix all instances where it fails.
 		"-Wno-constant-logical-operand",
 
 		// Disable this warning because we don't care about behavior with older compilers.