marvel: remove unneeded defines from cm.mk
marvel: add GAPPs to build