Merge "msm: audio: qdsp5v2: Change the 4.1 encoder driver to address 4.1 modem" into msm-3.0