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

Change-Id: I309d531f2ed3fdf9ca4e3deffc01424fee1047e1