yuga: reorganize cm.deps

Change-Id: Idc0eb0e76de9c7ef159d02d04d81b0afcc937cbc
Merge remote-tracking branch 'cm/cm-11.0' into HEAD