Merge "ASoC: msm9615: Add the amix control to configure AUX PCM rate" into msm-3.4