Merge "msm: clock: Move voltage scaling to prepare/unprepare" into msm-3.4