Merge "Remove M4 export to Make" am: a6ba0d2a4c am: 50e7c7f0c6 am: 9e2fd0fab6 am: 490da06137

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

Change-Id: Iac2cbb44e681ada39ddb68c4365e29b1f301c2d6

cc/makevars.go

@@ -148,8 +148,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
 	ctx.Strict("AIDL_CPP", "${aidlCmd}")
 	ctx.Strict("ALLOWED_MANUAL_INTERFACE_PATHS", strings.Join(allowedManualInterfacePaths, " "))
 
-	ctx.Strict("M4", "${m4Cmd}")
-
 	ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}")
 
 	ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")