Merge "msm: clock-8960: Enable cxo for clock measurement" into msm-3.0