diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
index 277ccfbd5be..cb30333484f 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs
@@ -232,7 +232,8 @@ void Extract (
 
 							// temporarily extracted directory will look like:
 							//    __library_projects__/[dllname]/[library_project_imports | jlibs]/bin
-							ZipFile.ExtractToDirectory (finfo.FullName, outDirForDll);
+							using (var zip = MonoAndroidHelper.ReadZipFile (finfo.FullName))
+								Files.ExtractAll (zip, outDirForDll);
 
 							// We used to *copy* the resources to overwrite other resources,
 							// which resulted in missing resource issue.
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/Files.cs b/src/Xamarin.Android.Build.Tasks/Utilities/Files.cs
index 140b56a75dc..2410688a5f4 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/Files.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/Files.cs
@@ -198,9 +198,9 @@ public static void ExtractAll(ZipArchive zip, string destination, Action<int, in
 			int i = 0;
 			int total = zip.Entries.Count;
 			foreach (var entry in zip.Entries) {
-
-				if (string.Equals(entry.FullName, "__MACOSX", StringComparison.OrdinalIgnoreCase) ||
-						string.Equals(entry.FullName, ".DS_Store", StringComparison.OrdinalIgnoreCase))
+				if (entry.FullName.Contains ("/__MACOSX/") ||
+						entry.FullName.EndsWith ("/__MACOSX", StringComparison.OrdinalIgnoreCase) ||
+						entry.FullName.EndsWith ("/.DS_Store", StringComparison.OrdinalIgnoreCase))
 					continue;
 				if (entry.IsDirectory ()) {
 					Directory.CreateDirectory (Path.Combine (destination, entry.FullName));
@@ -208,6 +208,7 @@ public static void ExtractAll(ZipArchive zip, string destination, Action<int, in
 				}
 				if (progressCallback != null)
 					progressCallback (i++, total);
+				Directory.CreateDirectory (Path.Combine (destination, Path.GetDirectoryName (entry.FullName)));
 				entry.ExtractToFile (Path.Combine (destination, entry.FullName), overwrite: true);
 			}
 		}
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveExtensions.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveExtensions.cs
index acf4782168e..6ce8edf160b 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveExtensions.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ZipArchiveExtensions.cs
@@ -74,7 +74,7 @@ public static void AddFiles (this ZipArchive archive, IEnumerable<string> fileNa
 
 		public static bool ContainsEntry (this ZipArchive archive, string entryName)
 		{
-			return archive.Entries.Any (x => string.Compare (x.Name, entryName, StringComparison.OrdinalIgnoreCase) == 0);
+			return archive.Entries.Any (x => string.Compare (x.FullName, entryName, StringComparison.OrdinalIgnoreCase) == 0);
 		}
 
 		public static bool IsDirectory (this ZipArchiveEntry entry)