Merge remote-tracking branch 'cm/cm-11.0' into newnuts

Conflicts:
	BoardConfig.mk

Change-Id: Iff2297e70c838f393845d6a8c67138dc85c034e7