diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index 11fda0c20..f429f4263 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -25,23 +25,29 @@
 # packaged in the SDK.
 #
 
-# Host tools that are parts of the SDK.
+# Host tools and java libraries that are parts of the SDK.
 PRODUCT_PACKAGES += \
 	adb \
 	bios.bin \
+	commons-compress-1.0 \
 	dexdump \
 	dmtracedump \
-	etc1tool \
-	hprof-conv \
-	vgabios-cirrus.bin
-
-# Native host Java libraries that are parts of the SDK.
-PRODUCT_PACKAGES += \
 	emmalib \
+	etc1tool \
 	groovy-all-1.7.0 \
 	guavalib \
+	hprof-conv \
+	jcommon-1.0.12 \
+	jfreechart-1.0.9 \
+	jfreechart-1.0.9-swt \
 	jsr305lib \
 	jython \
 	layoutlib \
-	layoutlib-tests
+	layoutlib-tests \
+	org.eclipse.core.commands_3.4.0.I20080509-2000 \
+	org.eclipse.equinox.common_3.4.0.v20080421-2006 \
+	org.eclipse.jface_3.4.2.M20090107-0800 \
+	osgi \
+	swing-worker-1.1 \
+	vgabios-cirrus.bin