Merge "audio vts: Remove explicit dependency on the new types"