Merge "msm: audio: qdsp6v2: Add support for other voice and mp3 codec" into msm-3.0