Merge "audiopolicy: switch to VolumeGroup for Output"