Move these to cm.mk

Change-Id: I04e6d810f31566679d9caaa79c9301f4a253a165
Merge remote-tracking branch 'cm/cm-12.0' into HEAD