Use my msm8960-common <- resolved conflict