diff --git a/.external b/.external
index c436f8504b9..7bc0d3e44e0 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
 xamarin/monodroid:master@63bbeb076d809c74811a8001d38bf2e9e8672627
-mono/mono:2019-06@761220d914e28b3ebd67e5642cf8c200110f62ec
+mono/mono:2019-06@a7919897e8bc1268547d60ca2283e619a3b3cc45
diff --git a/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs b/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs
index 44bab0bdc8f..2de5a75b3d2 100644
--- a/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs
+++ b/build-tools/xaprepare/xaprepare/Application/LlvmRuntime.cs
@@ -5,7 +5,7 @@ namespace Xamarin.Android.Prepare
 	partial class LlvmRuntime : Runtime
 	{
 		public override string Flavor => "LLVM";
-		public bool InstallBinaries { get; protected set; }
+		public bool InstallBinaries { get; protected set; } = true;
 
 		public LlvmRuntime (string name, Func<Context, bool> enabledCheck)
 			: base (name, enabledCheck)
@@ -13,7 +13,6 @@ public LlvmRuntime (string name, Func<Context, bool> enabledCheck)
 
 		public override void Init (Context context)
 		{
-			InstallBinaries = String.Compare (Name, AbiNames.Llvm.Windows64Bit, StringComparison.Ordinal) != 0;
 			if (Context.IsLlvmWindowsAbi (Name)) {
 				ExeSuffix = Configurables.Defaults.WindowsExecutableSuffix;
 				InstallPath = Configurables.Paths.InstallMSBuildDir;
diff --git a/build-tools/xaprepare/xaprepare/Application/MonoCrossRuntime.cs b/build-tools/xaprepare/xaprepare/Application/MonoCrossRuntime.cs
index 0c072c82624..c59eb042c70 100644
--- a/build-tools/xaprepare/xaprepare/Application/MonoCrossRuntime.cs
+++ b/build-tools/xaprepare/xaprepare/Application/MonoCrossRuntime.cs
@@ -18,14 +18,7 @@ public override void Init (Context context)
 				Strip = "strip";
 				StripFlags = "-S";
 			} else if (Context.IsWindowsCrossAotAbi (Name)) {
-				string mingwPrefix;
-
-				if (Context.Is32BitCrossAbi (Name))
-					mingwPrefix = Path.Combine (Configurables.Paths.MingwBinDir, Context.Properties.GetRequiredValue (KnownProperties.MingwCommandPrefix32));
-				else
-					mingwPrefix = Path.Combine (Configurables.Paths.MingwBinDir, Context.Properties.GetRequiredValue (KnownProperties.MingwCommandPrefix64));
-
-				Strip = $"{mingwPrefix}-strip";
+				Strip = Path.Combine (Configurables.Paths.MingwBinDir, Context.Properties.GetRequiredValue (KnownProperties.MingwCommandPrefix64) + "-strip");
 				ExeSuffix = Configurables.Defaults.WindowsExecutableSuffix;
 			} else
 				throw new InvalidOperationException ($"Unsupported cross compiler abi {Name}");
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs
index b88cef9ebfe..052d1d8484a 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.cs
@@ -99,11 +99,6 @@ partial class Runtimes
 				enabledCheck: (Context ctx) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Host64Bit)
 			),
 
-			new LlvmRuntime (
-				name: AbiNames.Llvm.Windows32Bit,
-				enabledCheck: (Context ctx) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Windows32Bit)
-			),
-
 			new LlvmRuntime (
 				name: AbiNames.Llvm.Windows64Bit,
 				enabledCheck: (Context) => IsLlvmRuntimeEnabled (ctx, AbiNames.Llvm.Windows64Bit)