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

Conflicts:
	BoardConfigCommon.mk

Change-Id: I097d2129708c09e538f4e7f7f7ef4fc192c2fd33