Merge "msm: iommu: Support alternate core clocks" into msm-3.4