Updates for CM12

Change-Id: Id3b1d479ddc96eed37ae87079197201ec66e11d8
Update media codecs

Change-Id: I49a204bfffb6a8e671980f19e30a15fbcca680a7
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	BoardConfigCommon.mk

Change-Id: Ibc1591d60dbf72615c178a2fa0618750405c6644