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

Change-Id: I7415580aa1cd49276f65d5ffc735390d5d5beae0