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

Change-Id: Ie12bb7186a5ee039550cd91017fc5fa8f85a4207