Update and rename cm.mk to aosp_s2vep.mk