Merge "Benchmark: Add test for Codec2 decoders" am: 71a763b475
am: f4021f5772

Change-Id: If08985fe3170c7241eefe06650c8903905e8371a