Merge "ASoC: wcd9310: Add the second mixer support to audio RX path" into msm-3.0