Merge "Asoc: msm: Add G711 media type support for Voip"