Merge "JankBench: Fix execution of incorrect benchmark"
am: 8a52fda1fa

Change-Id: I2032004ccf5e57a0ebb785e9adc0a871750529c4