Merge msm8960 to Ville