Merge "Clean up libaudioclient includes"