Merge "simpleperf: fix presubmit test." am: 18f8a1a981

Change-Id: I3d984be343d211b1830b327388bb69fca933705f