Remove Apollo, replace with AOSP/CAF Music. Remove LockClock as well since it's not in manifest

Conflicts:

	config/common.mk