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

Change-Id: I83b38de79a51d9a1008d6c1c2a67929c950f9989