Fixes after main merge

Still doesn't build, libunwind cmake fails, but we're a step closer.

Author: grendello

src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs

@@ -355,7 +355,7 @@ IList<string> MergeManifest (NativeCodeGenState codeGenState, Dictionary<string,
 			var tdCache = new TypeDefinitionCache ();
 			(List<TypeDefinition> allJavaTypes, List<TypeDefinition> javaTypesForJCW) = ScanForJavaTypes (resolver, tdCache, assemblies, userAssemblies, useMarshalMethods);
 			var jcwContext = new JCWGeneratorContext (arch, resolver, assemblies.Values, javaTypesForJCW, tdCache, useMarshalMethods);
-			var jcwGenerator = new JCWGenerator (Log, jcwContext);
+			var jcwGenerator = new JCWGenerator (Log, jcwContext, IntermediateOutputDirectory);
 			bool success;
 
 			if (generateJavaCode) {

src/Xamarin.Android.Build.Tasks/Tasks/GeneratePackageManagerJava.cs

@@ -388,7 +388,8 @@ void AddEnvironment ()
 						Log,
 						assemblyCount,
 						uniqueAssemblyNames,
-						EnsureCodeGenState (targetArch)
+						EnsureCodeGenState (targetArch),
+						mmTracingMode
 					);
 				} else {
 					marshalMethodsAsmGen = new MarshalMethodsNativeAssemblyGenerator (

src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs

@@ -42,13 +42,15 @@ class JCWGenerator
 {
 	readonly TaskLoggingHelper log;
 	readonly JCWGeneratorContext context;
+	readonly string intermediateOutputDirectory;
 
 	public MarshalMethodsClassifier? Classifier { get; private set; }
 
-	public JCWGenerator (TaskLoggingHelper log, JCWGeneratorContext context)
+	public JCWGenerator (TaskLoggingHelper log, JCWGeneratorContext context, string intermediateOutputDirectory)
 	{
 		this.log = log;
 		this.context = context;
+		this.intermediateOutputDirectory = intermediateOutputDirectory;
 	}
 
 	/// <summary>
@@ -88,7 +90,7 @@ public bool GenerateAndClassify (string androidSdkPlatform, string outputPath, s
 		);
 	}
 
-	MarshalMethodsClassifier MakeClassifier () => new MarshalMethodsClassifier (context.Arch, context.TypeDefinitionCache, context.Resolver, log);
+	MarshalMethodsClassifier MakeClassifier () => new MarshalMethodsClassifier (context.Arch, context.TypeDefinitionCache, context.Resolver, intermediateOutputDirectory, log);
 
 	bool ProcessTypes (bool generateCode, string androidSdkPlatform, MarshalMethodsClassifier? classifier, string? outputPath, string? applicationJavaClass)
 	{