Merge "Revert "Fix audio VTS build""