Update and rename aosp_d2cri.mk to cm.mk