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

Change-Id: I0f81f169fb90885f10f2b76e4e01decd4d9577f2