Switch msm8960 and vendor to main branches