Merge "Benchmark: Add backward compatibility for vorbis" am: 7efed09e5a

Change-Id: Ib78870d1db87ec1d85bd5f246c5a3afc289c3cc3