Merge "audio: mux audio from AIF2 for BT mic/uplink" into jb-mr1-dev