Add both variants of media profiles
Fix typo
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into defy-4.4-2.6.32

Conflicts:
	jordan.mk