AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
  BUG=1761105

Automated import of CL 144764
diff --git a/core/main.mk b/core/main.mk
index 815745b..04e9728 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -193,7 +193,7 @@
 endif
 # TODO: this should be eng I think.  Since the sdk is built from the eng
 # variant.
-tags_to_install := user
+tags_to_install := user debug eng
 ADDITIONAL_BUILD_PROPERTIES += xmpp.auto-presence=true
 ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes
 else # !sdk