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

Change-Id: I6ce4a5a92e5ec90521d20d9a32d14556c32163ff