Merge "msm: clock-rpm: Fix branch clocks so that they can be enabled" into msm-3.4