Merge "ASoc: msm: Add AMR NB and AMR WB support for Voip" into msm-3.0