diff --git a/core/main.mk b/core/main.mk
index 569d4dc1f..e35f2286f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -441,7 +441,6 @@ subdirs += \
 	sdk/ide_common \
 	sdk/jarutils \
 	sdk/layoutlib_api \
-	sdk/layoutopt \
 	sdk/ninepatch \
 	sdk/rule_api \
 	sdk/lint \
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 2e7017e89..d44046d4c 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -134,7 +134,6 @@ GRANDFATHERED_USER_MODULES += \
 	gps.mahimahi \
 	gralloc.default \
 	gralloc.qsd8k \
-	groovy-all-1.7.0 \
 	grxmlcompile \
 	guava \
 	guavalib \
@@ -171,7 +170,6 @@ GRANDFATHERED_USER_MODULES += \
 	layoutlib_api \
 	layoutlib_create \
 	layoutlib_utils \
-	layoutopt \
 	liba2dp \
 	libabi \
 	libandroid \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index ceb18986c..25cee17d6 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -77,7 +77,6 @@ PRODUCT_PACKAGES += \
 	ddms \
 	hierarchyviewer \
 	draw9patch \
-	layoutopt \
 	traceview \
 	android \
 	dexdump \
@@ -95,7 +94,6 @@ PRODUCT_PACKAGES += \
 	ddmuilib \
 	draw9patch \
 	hierarchyviewer \
-	layoutopt \
 	uix \
 	traceview \
 	anttasks \
@@ -104,7 +102,6 @@ PRODUCT_PACKAGES += \
 	sdkmanager \
 	swtmenubar \
 	swing-worker-1.1 \
-	groovy-all-1.7.0 \
 	commons-compress-1.0 \
 	emmalib \
 	jcommon-1.0.12 \