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

Conflicts:
	cm.mk

Change-Id: I6d92b997c65e60f4bcdf690e0ea3d444a9b0c618