tsubasa: reorganize cm.deps

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