odin: reorganize cm.deps

Change-Id: I72ecfad449b7c4a3c38656a4dce5baf2cb490036