diff --git a/Directory.Build.props b/Directory.Build.props
index 192cd4baef9..8be03bb468e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -21,6 +21,8 @@
     <ProduceReferenceAssemblyInOutDir>true</ProduceReferenceAssemblyInOutDir>
     <!-- Ensure command-line apps can use a newer .NET -->
     <RollForward>Major</RollForward>
+    <!-- We don't need to be warned that we are using a preview .NET -->
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 472789479ca..984757d64de 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -208,7 +208,7 @@ stages:
       parameters:
         project: Xamarin.Android.sln
         arguments: >-
-          -t:BuildDotNet,PackDotNet -c $(XA.Build.Configuration) -m:1 -v:n
+          -t:BuildDotNet,PackDotNet -c $(XA.Build.Configuration) -v:n
           -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build.binlog
         displayName: Build Solution
         continueOnError: false
diff --git a/build-tools/create-android-api/create-android-api.csproj b/build-tools/create-android-api/create-android-api.csproj
index 61452e944fa..73f4a017a2e 100644
--- a/build-tools/create-android-api/create-android-api.csproj
+++ b/build-tools/create-android-api/create-android-api.csproj
@@ -12,6 +12,7 @@
     <ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
     <ProjectReference Include="..\api-xml-adjuster\api-xml-adjuster.csproj" ReferenceOutputAssembly="False" />
     <ProjectReference Include="..\api-merge\api-merge.csproj" ReferenceOutputAssembly="False" />
+    <ProjectReference Include="..\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="False" SkipGetTargetFrameworkProperties="True" AdditionalProperties="TargetFramework=net472" />
   </ItemGroup>
   
   <PropertyGroup>
@@ -117,6 +118,17 @@
         Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(ApiMerge) -config=$(_ConfigurationFile) -config-input-dir=$(_ConfigurationInputBaseDirectory) -config-output-dir=$(_ConfigurationOutputBaseDirectory)" />
         
   </Target>
+  
+  <!-- Generates 'JNIEnv.g.cs' file. We do this here because it should only run once, not per-TF.  -->
+  <Target Name="_BuildJNIEnv"
+      BeforeTargets="Build"
+      Inputs="..\..\bin\Build$(Configuration)\jnienv-gen.exe"
+      Outputs="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs">
+    <Exec
+        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;../../bin/Build$(Configuration)/jnienv-gen.exe&quot; -o ../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs --use-java-interop"
+    />
+    <Touch Files="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs" />
+  </Target>
 
   <!-- Clean up generated API files -->
   <Target Name="_CleanApiXml"
diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk
index 72b80cf9288..71604445d00 100644
--- a/build-tools/scripts/BuildEverything.mk
+++ b/build-tools/scripts/BuildEverything.mk
@@ -27,6 +27,6 @@ endif
 leeroy: leeroy-all framework-assemblies
 
 leeroy-all:
-	$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) -m:1 $(_MSBUILD_ARGS)
+	$(call DOTNET_BINLOG,leeroy-all) $(SOLUTION) $(_MSBUILD_ARGS)
 	$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
 	$(call MSBUILD_BINLOG,leeroy-all,$(_SLN_BUILD)) /restore tools/xabuild/xabuild.csproj /p:Configuration=$(CONFIGURATION) $(_MSBUILD_ARGS)
diff --git a/external/Java.Interop b/external/Java.Interop
index d0ef9e32284..51c3dae7662 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit d0ef9e3228472c9673451c924df50441c0258706
+Subproject commit 51c3dae766281a1c5b9e122304aabdd43377c044
diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
index 672edf93459..8a29a0f1340 100644
--- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
+++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
     <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" />
+    <ProjectReference Include="..\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj" ReferenceOutputAssembly="False" />
 
     <Compile Include="..\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs" Link="Profile.g.cs" />
 
diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index 7e7a525fd89..c4150010091 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -374,7 +374,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\build-tools\create-android-api\create-android-api.csproj" ReferenceOutputAssembly="false" />
     <!-- Explicitly pass the target framework of the project so we don't have conflicts with the multiple targets in this file. -->
-    <ProjectReference Include="..\..\build-tools\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472" />
     <ProjectReference Include="..\..\external\Java.Interop\tools\generator\generator.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472"/>
     <ProjectReference Include="..\..\external\Java.Interop\tools\java-source-utils\java-source-utils.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=$(DotNetTargetFramework)" />
     <ProjectReference Include="..\..\external\Java.Interop\tools\jcw-gen\jcw-gen.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=net472" />
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index d9c2876c2b1..735a8761d19 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -30,11 +30,12 @@
       <_GlobalProperties>
         JavaInteropProfile=Net45;
         XAInstallPrefix=$(XAInstallPrefix);
-        TargetFrameworkIdentifier=MonoAndroid;
-        TargetFrameworkVersion=v1.0;
-        TargetFrameworkRootPath=$(XAInstallPrefix)xbuild-frameworks;
       </_GlobalProperties>
     </PropertyGroup>
+    <MSBuild
+        Projects="$(JavaInteropFullPath)\build-tools\jnienv-gen\jnienv-gen.csproj"
+        Properties="TargetFramework=net472;"
+    />
     <MSBuild
         Projects="$(JavaInteropFullPath)\src\Java.Interop\Java.Interop-MonoAndroid.csproj"
         Properties="$(_GlobalProperties)"
@@ -120,17 +121,6 @@
     <Touch Files="$(_AndroidJavadocXml)" />
   </Target>
   
-  <!-- Generates 'JNIEnv.g.cs' file -->
-  <Target Name="_BuildJNIEnv"
-      BeforeTargets="CoreCompile"
-      Inputs="..\..\bin\Build$(Configuration)\jnienv-gen.exe"
-      Outputs="Android.Runtime\JNIEnv.g.cs">
-    <Exec
-        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;../../bin/Build$(Configuration)/jnienv-gen.exe&quot; -o Android.Runtime/JNIEnv.g.cs --use-java-interop"
-    />
-    <Touch Files="Android.Runtime\JNIEnv.g.cs" />
-  </Target>
-  
   <!-- Copies common 'api-X.xml' to the 'obj' directory.
        This is needed because 'generator' writes intermediate files like 'api-X.xml.fixed' next to the source
        'api-X.xml' and multiple profiles are using the source, so these files will clobber each other. -->
diff --git a/src/manifestmerger/manifestmerger.csproj b/src/manifestmerger/manifestmerger.csproj
index 7aafd3b11a8..e356c656187 100644
--- a/src/manifestmerger/manifestmerger.csproj
+++ b/src/manifestmerger/manifestmerger.csproj
@@ -7,6 +7,12 @@
   </PropertyGroup>
   
   <Import Project="..\..\Configuration.props" />
+
+  <ItemGroup>
+    <!-- There isn't an actual dependency here, but we can only build one 'gradlew' project
+         at a time, and adding <ProjectReference> between them ensures they run sequentially. -->
+    <ProjectReference Include="..\apksigner\apksigner.csproj" ReferenceOutputAssembly="False" />
+  </ItemGroup>
   
   <Import Project="manifestmerger.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/r8/r8.csproj b/src/r8/r8.csproj
index 41313de1bd8..f355168160b 100644
--- a/src/r8/r8.csproj
+++ b/src/r8/r8.csproj
@@ -8,6 +8,12 @@
     <OutputPath Condition="'$(OutputPath)'==''">bin\$(Configuration)</OutputPath>
   </PropertyGroup>
   
+  <ItemGroup>
+    <!-- There isn't an actual dependency here, but we can only build one 'gradlew' project
+         at a time, and adding <ProjectReference> between them ensures they run sequentially. -->
+    <ProjectReference Include="..\manifestmerger\manifestmerger.csproj" ReferenceOutputAssembly="False" />
+  </ItemGroup>
+
   <Import Project="..\..\Configuration.props" />
   <Import Project="r8.targets" />
 </Project>