Merge "msm: msm_bus: Fix scaling of ocmem core clock" into msm-3.4