Merge "Move Music to /product" am: 3eadd106d7
am: 921a776dd2

Change-Id: I2bb9e0a137e1c32076adb2057aac3d21467f432f