Merge "msm: Add support for amr-wb+ non-tunnel driver"