diff --git a/external/mono b/external/mono
index 24e82a53858..06060e290dd 160000
--- a/external/mono
+++ b/external/mono
@@ -1 +1 @@
-Subproject commit 24e82a538588116cbd490eac44ff98fc9f4a9817
+Subproject commit 06060e290dd379145112a4f31efd0ccc76c9ea24
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
index 21268f3da3e..3289c33bb68 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -30,6 +30,18 @@ public void BuildReleaseApplicationWithSpacesInPath ()
 				IsRelease = true,
 				AotAssemblies = true,
 			};
+			proj.Imports.Add (new Import ("foo.targets") {
+				TextContent = () => @"<?xml version=""1.0"" encoding=""utf-16""?>
+<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+<Target Name=""_Foo"" AfterTargets=""_SetLatestTargetFrameworkVersion"">
+	<PropertyGroup>
+		<AotAssemblies Condition=""!Exists('$(MonoAndroidBinDirectory)"+ Path.DirectorySeparatorChar + @"cross-arm')"">False</AotAssemblies>
+	</PropertyGroup>
+	<Message Text=""$(AotAssemblies)"" />
+</Target>
+</Project>
+",
+			});
 			using (var b = CreateApkBuilder (Path.Combine ("temp", "BuildReleaseAppWithA InIt(1)"))) {
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
 			}