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

Change-Id: I90ff44942114da48426286ad36d58b7ff1379e41