-

diff --git a/src/bindings/Makefile b/src/bindings/Makefile
index 47eab37..e77db98 100644
--- a/src/bindings/Makefile
+++ b/src/bindings/Makefile
@@ -18,7 +18,7 @@ MAPS_ASSEMBLIES = $(FRAMEWORKS:%=$(platforms_dir)/%/Mono.Android.GoogleMaps.dll)
 
 all:: $(COMPATIBILITY_V4_ASSEMBLIES)
 all:: $(COMPATIBILITY_V13_ASSEMBLIES)
-all:: $(MAPS_ASSEMBLIES)
+#all:: $(MAPS_ASSEMBLIES)
 
 PWD := $(shell pwd)
 
diff --git a/tests/codegen/Makefile b/tests/codegen/Makefile
index c4370af..ebc73c7 100644
--- a/tests/codegen/Makefile
+++ b/tests/codegen/Makefile
@@ -3,7 +3,7 @@ include ../../env.config
 include $(TOP)/mk/build.make
 
 APKS = \
-	Xamarin.Android.JcwGen-Tests/bin/Debug/Xamarin.Android.JcwGen-Tests-Signed.apk \
+#	Xamarin.Android.JcwGen-Tests/bin/Debug/Xamarin.Android.JcwGen-Tests-Signed.apk \
 	Xamarin.Android.MakeBundle-Tests/bin/Debug/Xamarin.Android.MakeBundle-Tests-Signed.apk
 
 # $(call run-xbuild,CSPROJ,TARGET,EXTRA_ARGS)
diff --git a/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi-v7a/libsimple.so b/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi-v7a/libsimple.so
index 37115ea..be9e928 100755
Binary files a/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi-v7a/libsimple.so and b/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi-v7a/libsimple.so differ
diff --git a/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi/libsimple.so b/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi/libsimple.so
index c1cd817..eafb804 100755
Binary files a/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi/libsimple.so and b/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/armeabi/libsimple.so differ
diff --git a/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/x86/libsimple.so b/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/x86/libsimple.so
index fa79154..39b6ed1 100755
Binary files a/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/x86/libsimple.so and b/tests/codegen/Xamarin.Android.LibraryProjectZip-LibBinding/libs/x86/libsimple.so differ
diff --git a/tests/locales/Makefile b/tests/locales/Makefile
index cb59287..c9a48f4 100644
--- a/tests/locales/Makefile
+++ b/tests/locales/Makefile
@@ -13,7 +13,8 @@ define run-xbuild
 		$(if $(API_LEVELS),/p:AndroidApiLevel=$(lastword $(API_LEVELS)) /p:AndroidUseLatestPlatformSdk=False,)
 endef
 
-all:: $(APK)
+#all:: $(APK)
+all::
 
 clean::
 	-$(call run-xbuild,$(SLN),Clean,$(CLEAN_EXTRA))
diff --git a/tools/RuntimeService/Makefile b/tools/RuntimeService/Makefile
index aa1a5a1..4b6bf24 100644
--- a/tools/RuntimeService/Makefile
+++ b/tools/RuntimeService/Makefile
@@ -99,7 +99,6 @@ $(PLATFORM_APKS): $(platforms_dir)/android-%/Mono.Android.Platform.apk: Makefile
 		$(wildcard $(frameworks_dir)/*/Mono.Android.Support.v4.dll) \
 		$(wildcard $(frameworks_dir)/*/Mono.Android.Support.v13.dll) \
 		$(wildcard $(frameworks_dir)/*/Mono.Android.Export.dll) \
-		$(wildcard $(frameworks_dir)/*/Mono.Android.GoogleMaps.dll) \
 		$(wildcard $(frameworks_dir)/*/OpenTK.dll) \
 		$(wildcard $(frameworks_dir)/*/OpenTK-1.0.dll)
 	$(RM) -R platforms/android-$*
@@ -113,7 +112,6 @@ $(PLATFORM_APKS): $(platforms_dir)/android-%/Mono.Android.Platform.apk: Makefile
 		$(frameworks_dir)/$$framework/OpenTK-1.0.dll* \
 		$(frameworks_dir)/$$framework/Mono.Android.Support*.dll* \
 		$(frameworks_dir)/$$framework/Mono.Android.Export.dll* \
-		$(frameworks_dir)/$$framework/Mono.Android.GoogleMaps.dll* \
 		platforms/android-$*/r/assemblies
 	$(Q) $(AAPT) package -f -0 .dll -0 .mdb -M platforms/android-$*/AndroidManifest.xml \
 		-I $(ANDROID_SDK_PATH)/platforms/android-8/android.jar \