diff --git a/Directory.Build.props b/Directory.Build.props
index a8100495c40..5529f35e0f5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -27,7 +27,7 @@
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>2.0.2</LibZipSharpVersion>
+    <LibZipSharpVersion>2.0.3</LibZipSharpVersion>
     <MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index d0ab6aca376..0e80ea1adb3 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit d0ab6aca376d9f7b379e9a74d3acdc0488018103
+Subproject commit 0e80ea1adb3757e85c768f9cd2cb79214781e2a8
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
index a1f9b17c271..acb9ab380d8 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
@@ -181,8 +181,10 @@ void ExecuteWithAbi (string [] supportedAbis, string apkInputPath, string apkOut
 					AddFileToArchiveIfNewer (apk, dex.ItemSpec, DalvikPath + dexPath, compressionMethod: dexCompressionMethod);
 				}
 
-				if (EmbedAssemblies && !BundleAssemblies)
+				if (EmbedAssemblies && !BundleAssemblies) {
 					AddAssemblies (apk, debug, compress, compressedAssembliesInfo, assemblyStoreApkName);
+					apk.Flush ();
+				}
 
 				AddRuntimeLibraries (apk, supportedAbis);
 				apk.Flush();