diff --git a/.gitmodules b/.gitmodules
index 201787783c6..5dba9c4bf89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,4 +41,4 @@
 [submodule "external/xamarin-android-tools"]
     path = external/xamarin-android-tools
     url = https://github.com/xamarin/xamarin-android-tools
-    branch = d17-5
+    branch = dev/jonp/jonp-net8-sync
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index ca1552d5b40..55f830b48ab 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit ca1552d5b40d3fb9cbeff6148f662c67068d6d9f
+Subproject commit 55f830b48abbc31d6ba9594b30e623a221e3f442