Merge "msm8960: Add support for MSM8130 variants"