Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7df

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326314

Change-Id: I45068a8fb9985d23da62da90b7d4304d71448664

cc/compiler.go

@@ -300,8 +300,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
 	if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {
 		flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
 			"${config.CommonGlobalIncludes}",
-			tc.IncludeFlags(),
-			"${config.CommonNativehelperInclude}")
+			tc.IncludeFlags())
 	}
 
 	if ctx.useSdk() {