Update and rename aries.mk to cm.mk

Revert switch to AOKP