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

Conflicts:
	BoardConfig.mk
	cm.mk
	init/init_nicki.c
Merge branch 'nolinuxnoparty' into HEAD

Conflicts:
	BoardConfig.mk
	cm.mk
	init/init_nicki.c

Change-Id: I7494f06fd230da2610aefbde7ef98009fba66f9f