Don't override Music package

Conflicts:
	Android.mk