Merge "msm: 8960: Change the msm master clock for AUXPCM" into msm-3.4