Revert "Remove layoutopt; replaced by the more generic "lint" tool."

This reverts commit 7a23d45cdc.

core/main.mk

@@ -441,6 +441,7 @@ subdirs += \
 	sdk/ide_common \
 	sdk/jarutils \
 	sdk/layoutlib_api \
+	sdk/layoutopt \
 	sdk/ninepatch \
 	sdk/rule_api \
 	sdk/lint \

core/user_tags.mk

@@ -134,6 +134,7 @@ GRANDFATHERED_USER_MODULES += \
 	gps.mahimahi \
 	gralloc.default \
 	gralloc.qsd8k \
+	groovy-all-1.7.0 \
 	grxmlcompile \
 	guava \
 	guavalib \
@@ -170,6 +171,7 @@ GRANDFATHERED_USER_MODULES += \
 	layoutlib_api \
 	layoutlib_create \
 	layoutlib_utils \
+	layoutopt \
 	liba2dp \
 	libabi \
 	libandroid \

target/product/sdk.mk

@@ -77,6 +77,7 @@ PRODUCT_PACKAGES += \
 	ddms \
 	hierarchyviewer \
 	draw9patch \
+	layoutopt \
 	traceview \
 	android \
 	dexdump \
@@ -94,6 +95,7 @@ PRODUCT_PACKAGES += \
 	ddmuilib \
 	draw9patch \
 	hierarchyviewer \
+	layoutopt \
 	uix \
 	traceview \
 	anttasks \
@@ -102,6 +104,7 @@ PRODUCT_PACKAGES += \
 	sdkmanager \
 	swtmenubar \
 	swing-worker-1.1 \
+	groovy-all-1.7.0 \
 	commons-compress-1.0 \
 	emmalib \
 	jcommon-1.0.12 \