Revert "Ship Music2, not Music"

This reverts commit 1ad24f57a1a3949dfc1e5bf19f661df1bd08c080.

Bug: 9518830
Change-Id: I3cfe98b418512d4d396c4528b98b978cf5bc3c30
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 39e3ece..d999552 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -33,7 +33,7 @@
     Keyguard \
     LatinIME \
     Launcher2 \
-    Music2 \
+    Music \
     MusicFX \
     OneTimeInitializer \
     PrintSpooler \