Merge "Consolidate libaudioclient buffers p1"