cleanup
restore old way copy media_profiles
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into defy-4.4-2.6.32

Conflicts:
	AndroidProducts.mk
	aosp_mb526.mk
	full_jordan.mk
	full_mb526.mk
	mb526.mk