Merge "ASoC: msm: Add AMR-WB tunnel capture support" into msm-3.4