Revert "Ship Music2, not Music"

This reverts commit 1ad24f57a1a3949dfc1e5bf19f661df1bd08c080.

Bug: 9518830
Change-Id: I3cfe98b418512d4d396c4528b98b978cf5bc3c30
1 file changed