Merge "Revert "Remove implict jni.h include path"" am: e29cac0861

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

Change-Id: Ib3f491b9345d5af760551562ee5cbb82501b365e

cc/compiler.go

@@ -300,7 +300,8 @@ 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())
+			tc.IncludeFlags(),
+			"${config.CommonNativehelperInclude}")
 	}
 
 	if ctx.useSdk() {