Merge "msm: scm: change svc id SCM_SVC_CP to a more generic SCM_SVC_MP"