some intrails from picking

Change-Id: Ic7302e4214d5fdd888123c6ee0751621b51b4036
Revert "audio: Changes for LPA/Tunnel mode"

This reverts commit eb9203f62d27d3729c354ccb43c404d77bfeb047.