Merge "Benchmark: add Decoder" am: 789fb735a6 am: 3a1b9cf380 am: c134cd407b
am: 26e2ce8eef

Change-Id: I84f99d5a3c65ea4b2f4a26e796c691fcc795d138