diff --git a/build/product_sdk.mk b/build/product_sdk.mk
index f429f4263..ad827788d 100644
--- a/build/product_sdk.mk
+++ b/build/product_sdk.mk
@@ -35,19 +35,19 @@ PRODUCT_PACKAGES += \
 	emmalib \
 	etc1tool \
 	groovy-all-1.7.0 \
-	guavalib \
+	guava-tools \
 	hprof-conv \
 	jcommon-1.0.12 \
 	jfreechart-1.0.9 \
 	jfreechart-1.0.9-swt \
-	jsr305lib \
 	jython \
 	layoutlib \
 	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 \
+	org.eclipse.jface_3.6.2.M20110210-1200 \
+	org.eclipse.equinox.common_3.6.0.v20100503 \
+	org.eclipse.core.commands_3.6.0.I20100512-1500 \
 	osgi \
 	swing-worker-1.1 \
 	vgabios-cirrus.bin
 
+:qa!