diff --git a/core/main.mk b/core/main.mk
index 07f92c9..ecea8de 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -644,7 +644,7 @@
   # TODO: Should we do this for all builds and not just the sdk?
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
-      $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))
+      $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))
   $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \
     $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\
       $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!)))
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 7f681b1..0830101 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -50,7 +50,6 @@
     libstdc++ \
     libstlport \
     libsurfaceflinger \
-    libsurfaceflinger_client \
     libsurfaceflinger_ddmconnection \
     libsysutils \
     libthread_db \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index d6d9bec..1e66305 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -26,7 +26,6 @@
     Calendar \
     CertInstaller \
     DrmProvider \
-    Email2 \
     Exchange2 \
     FusedLocation \
     Gallery2 \
diff --git a/target/product/large_emu_hw.mk b/target/product/large_emu_hw.mk
index 27ebc96..fffe0f7 100644
--- a/target/product/large_emu_hw.mk
+++ b/target/product/large_emu_hw.mk
@@ -27,7 +27,6 @@
     Calendar \
     CertInstaller \
     DrmProvider \
-    Email2 \
     Exchange2 \
     Gallery2 \
     LatinIME \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index b6fe025..4088584 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -20,7 +20,6 @@
 PRODUCT_PACKAGES := \
 	Calculator \
 	DeskClock \
-	Email2 \
 	Exchange2 \
 	FusedLocation \
 	Gallery \
@@ -78,27 +77,6 @@
 	audio_policy.default \
 	local_time.default
 
-
-# Host tools.
-PRODUCT_PACKAGES += \
-	fastboot \
-	emulator-x86 \
-	emulator-arm \
-	emulator-mips \
-	emulator64-x86 \
-	emulator64-arm \
-	emulator64-mips \
-	libOpenglRender \
-	libGLES_CM_translator \
-	libGLES_V2_translator \
-	libEGL_translator \
-	lib64OpenglRender \
-	lib64GLES_CM_translator \
-	lib64GLES_V2_translator \
-	lib64EGL_translator \
-	hierarchyviewer2 \
-	emugen
-
 PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
 
 PRODUCT_COPY_FILES := \