Move a few things to cm.mk

Change-Id: Ifa4e6fee9796e7d8ee20bb90f8a7618206f55dc2

Conflicts:
	cm.mk