diff --git a/cc/compiler.go b/cc/compiler.go
index 8afd1bd..f7e787c 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -219,7 +219,6 @@
 		if !(ctx.sdk() || ctx.vndk()) || ctx.Host() {
 			flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
 				"${config.CommonGlobalIncludes}",
-				"${config.CommonGlobalSystemIncludes}",
 				tc.IncludeFlags(),
 				"${config.CommonNativehelperInclude}")
 		}
diff --git a/cc/config/global.go b/cc/config/global.go
index 774f3f7..8c24289 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -112,9 +112,6 @@
 			"libnativehelper/include",
 			"frameworks/native/include",
 			"frameworks/native/opengl/include",
-		})
-	pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
-		[]string{
 			"frameworks/av/include",
 		})
 	// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help
diff --git a/cc/makevars.go b/cc/makevars.go
index ce2ac5a..22b9013 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -77,7 +77,7 @@
 
 	ctx.Strict("AIDL_CPP", "${aidlCmd}")
 
-	includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes} ${config.CommonGlobalSystemIncludes}")
+	includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}")
 	if err != nil {
 		panic(err)
 	}