Merge "Benchmark: add Encoder"
am: 0647d8c5f6

Change-Id: I9ffb27ffa318c5351c926e4dbcaafd25c7f56c9d