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

Change-Id: I2c63c5a9be0d85cbd92b5f8340188446646155bf