Merge "msm: clock-local: Consolidate definitions of clk_ops" into msm-3.0