Update cm.mk
manually merge upstream