odin: reorganize cm.deps

Change-Id: I72ecfad449b7c4a3c38656a4dce5baf2cb490036
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_sony_odin into kk_mkt

Conflicts:
	mk.dependencies