k2cl: replace s4-common with msm8960-common