Merge branch 'main' into dev/grendel/extended-timing

* main:
  Add a property required by #8478 (#8749)

src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs

@@ -33,6 +33,8 @@ public class BuildApk : AndroidTask
 		[Required]
 		public string ApkOutputPath { get; set; }
 
+		public string AppSharedLibrariesDir { get; set; }
+
 		[Required]
 		public ITaskItem[] ResolvedUserAssemblies { get; set; }