Merge "Remove MODULE_LICENSE_APACHE2 from apps/Music" am: 20dfa269dd am: 9229c1f297 am: abe9ee0e54 am: 072752d5fb

Change-Id: I9c9e8a673fee2ea9067955de61d2e79e96823c37