Merge "Benchmark: Add backward compatibility for vorbis"