Merge "ASoC: msm: Reset the calibration block after subsystem restart" into msm-3.4