diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
index d6891a9f95e..eae8eff6973 100755
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -361,6 +361,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
-
+
@@ -537,7 +538,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
+ DependsOnTargets="$(_OnResolveMonoAndroidSdks)">
@@ -607,7 +608,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
-
+
android.support.multidex.MultiDexApplication
android.app.Application
@@ -615,6 +616,14 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
+
+
+ <_OnResolveMonoAndroidSdks>
+ _ResolveMonoAndroidSdks
+ ;$(_AfterResolveMonoAndroidSdks)
+
+
+
@@ -2430,7 +2441,7 @@ because xbuild doesn't support framework reference assemblies.
<_BuildApkDependsOnTargets>
Build
- ;_ResolveMonoAndroidSdks
+ ;$(_OnResolveMonoAndroidSdks)
;_ValidateAndroidPackageProperties
;_BuildApkEmbed