use CM s2-common

Change-Id: I2e70b13fdae6e037380941663bd3f25719e48de6