Merge "Revert "Revert "Fix audio VTS build"""