Merge "audio: Changes to support AV streaming in offload path"