Merge "USB audio: fix imports"