add m8whl to device asserts

Change-Id: Id8ac7cb6dc8529fd065ea55f156536c870352ff4
m8spr: correct setup-makefiles script

Change-Id: Ie719abe3af0ea7d9b467a76416682b0d59972ee8
Merge remote-tracking branch 'upstream/cm-11.0' into kitkat

Conflicts:
	BoardConfig.mk