diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj
index c4150010091..8cc95be552f 100644
--- a/src/Mono.Android/Mono.Android.csproj
+++ b/src/Mono.Android/Mono.Android.csproj
@@ -375,7 +375,6 @@
     <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="..\..\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" />
     <ProjectReference Include="..\..\src\java-runtime\java-runtime.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\r8\r8.csproj" ReferenceOutputAssembly="False" />
diff --git a/src/apksigner/apksigner.csproj b/src/apksigner/apksigner.csproj
index 7807152e355..5860e929093 100644
--- a/src/apksigner/apksigner.csproj
+++ b/src/apksigner/apksigner.csproj
@@ -16,23 +16,11 @@
     <None Include="build\libs\apksigner.jar" CopyToOutputDirectory="PreserveNewest" Link="apksigner.jar" />
   </ItemGroup>
 
-  <Target Name="_BuildGradle"
-      BeforeTargets="GetCopyToOutputDirectoryItems"
-      Inputs="$(MSBuildThisFile);build.gradle"
-      Outputs="build\libs\apksigner.jar">
-    <Exec
-        Command="&quot;$(GradleWPath)&quot; jar $(GradleArgs) -PjavaSourceVer=$(JavacSourceVersion) -PjavaTargetVer=$(JavacTargetVersion)"
-        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory);APP_HOME=$(GradleHome)"
-        WorkingDirectory="$(MSBuildThisFileDirectory)"
-    />
-    <Touch Files="build\libs\apksigner.jar" />
-  </Target>
+  <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="..\..\external\Java.Interop\tools\java-source-utils\java-source-utils.csproj" ReferenceOutputAssembly="False" SkipGetTargetFrameworkProperties="True" AdditionalProperties="TargetFramework=$(DotNetTargetFramework)" />
+  </ItemGroup>
 
-  <Target Name="_CleanGradle" BeforeTargets="Clean">
-    <Exec
-        Command="&quot;$(GradleWPath)&quot; clean $(GradleArgs)"
-        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory);APP_HOME=$(GradleHome)"
-        WorkingDirectory="$(MSBuildThisFileDirectory)"
-    />
-  </Target>
+  <Import Project="apksigner.targets" />
 </Project>
diff --git a/src/apksigner/apksigner.targets b/src/apksigner/apksigner.targets
new file mode 100644
index 00000000000..b6459821136
--- /dev/null
+++ b/src/apksigner/apksigner.targets
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <Target Name="_BuildGradle"
+      BeforeTargets="GetCopyToOutputDirectoryItems"
+      Inputs="$(MSBuildThisFile);build.gradle"
+      Outputs="build\libs\apksigner.jar">
+    <Exec
+        Command="&quot;$(GradleWPath)&quot; jar $(GradleArgs) -PjavaSourceVer=$(JavacSourceVersion) -PjavaTargetVer=$(JavacTargetVersion)"
+        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory);APP_HOME=$(GradleHome)"
+        WorkingDirectory="$(MSBuildThisFileDirectory)"
+    />
+    <Touch Files="build\libs\apksigner.jar" />
+  </Target>
+
+  <Target Name="_CleanGradle" BeforeTargets="Clean">
+    <Exec
+        Command="&quot;$(GradleWPath)&quot; clean $(GradleArgs)"
+        EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory);APP_HOME=$(GradleHome)"
+        WorkingDirectory="$(MSBuildThisFileDirectory)"
+    />
+  </Target>
+
+</Project>