Rebase to be against gproj-common

Change-Id: I3ba730dac69c28487d3c998198a6311ccf876eae
Update cm.dependencies

Change-Id: I0ab45b81334601c26a2d0c8a8dec9c515cbcb606