Merge "Benchmark: add Encoder" am: 0647d8c5f6 am: 8c8ce72cac am: 8d92a02dbe
am: dc6a107f11

Change-Id: Ide4dc79d7f660f6f961d6f02e52af89163e108f8