Manual merge into master

Change-Id: Ib71bf36e1205e0bbf1f375cee4a28bceaba60c97
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 26f60d7..46ac117 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -32,6 +32,8 @@
 	aapt \
 	acp \
 	adb \
+	AdbWinApi \
+	AdbWinUsbApi \
 	adbd \
 	aidl \
 	am \
@@ -524,6 +526,7 @@
 	screenshot \
 	screenshot2 \
 	sdcard \
+	sdklauncher \
 	sdklib \
 	sdkmanager \
 	sdkstats \