diff --git a/Documentation/release-notes/4640.md b/Documentation/release-notes/4640.md
new file mode 100644
index 00000000000..8148530dbb6
--- /dev/null
+++ b/Documentation/release-notes/4640.md
@@ -0,0 +1,5 @@
+#### Application and library build and deployment
+
+  * [GitHub PR 79](https://github.com/xamarin/xamarin-android-tools/commit/f473ff9):
+    May address an `ArgumentException` observed on Windows machine when the
+    Registry contains an invalid path to the Android SDK.
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 12f52acd440..f5fcb9fd158 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 12f52acd4407323b2e1b48ca56bab80ffd97b31e
+Subproject commit f5fcb9fd1583ebe928734e8525303a0dbe93c79c