Merge "Benchmark: Add support to configure encoders through test parameters" am: 239061853d

Change-Id: I96f09ee77fbf4c4a91e1ddb71d302d01ed352c18