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

Change-Id: I4b9bf68ddade907f423d97a77cc00478614c4942