update cm.dependencies
update cm.dependencies

Change-Id: I16c940d3b7ecc94105b119114ec30dffa49406e3
fix dependencies

Change-Id: Iafdb972fdda41a8970bf0e578db9b404a1bd438c
Merge commit '6f6dfeae013d8c2ee9a40fe81f0f287244df5788' into cm-11.0

Conflicts:
	cm.dependencies