Merge "msm: clock-8960: Support alternate PLL4 clock plan" into msm-3.4