s4-common: Move cm.dependencies to common

Change-Id: I7d31bbf6d0168dc8705d722f33b5e03add6ce28e
Merge branch 'cm' into HEAD