nicki: reorganize cm.deps

moving to sony/qcom-common

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

Conflicts:
	cm.dependencies

Change-Id: If4565d10cf8ff9695fc970da776dfa31a7ee5968