pollux: reorganize cm.deps

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

Conflicts:
	cm.dependencies

Change-Id: Ibc569792852eb66ad765d4c66e3e516a30f7dc4f