Updates for CM12

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

Conflicts:
	BoardConfigCommon.mk

Change-Id: I25bc3db9dac267e1ca545eb4e626f6b42dbb18d1