am da21ccf8: Grandfather the simulator-specific modules. do not merge.

Merge commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp

* commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
  Grandfather the simulator-specific modules. do not merge.
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 3c7fa02..3744261 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -180,6 +180,7 @@
 	kcm \
 	keystore \
 	kxml2-2.3.0 \
+	launch-wrapper \
 	layoutlib \
 	layoutlib_api \
 	layoutlib_create \
@@ -380,6 +381,7 @@
 	libvpx \
 	libwebcore \
 	libwpa_client \
+	libwrapsim \
 	libxml2 \
 	libz \
 	libzipfile \
@@ -448,6 +450,7 @@
 	rild \
 	rsg-generator \
 	run-as \
+	runtime \
 	schedtest \
 	screenshot2 \
 	sdcard \
@@ -472,6 +475,7 @@
 	signapk \
 	signature-tools \
 	simg2img \
+	simulator \
 	soslim \
 	spec-progress \
 	sqlite3 \