Move these to cm.mk

Change-Id: I04e6d810f31566679d9caaa79c9301f4a253a165
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_motorola_qcom-common into lollipop

Signed-off-by: cj360 <ayunker551@gmail.com>

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: I297013211b2ca31004e353ac7f885b6a3759e975