Merge branch 'main' into typemap-per-rid-support

* main:
  [AndroidDependenciesTests] Use platform-tools 34.0.4 (dotnet#8184)

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs

@@ -36,7 +36,7 @@ public void InstallAndroidDependenciesTest ()
 				var proj = new XamarinAndroidApplicationProject {
 					TargetSdkVersion = apiLevel.ToString (),
 				};
-				const string ExpectedPlatformToolsVersion = "34.0.3";
+				const string ExpectedPlatformToolsVersion = "34.0.4";
 				using (var b = CreateApkBuilder ()) {
 					b.CleanupAfterSuccessfulBuild = false;
 					string defaultTarget = b.Target;