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

Change-Id: I1eac1687883659031eddb01d38056972274a2985