Merge "simpleperf: fix test on APCT." am: e6f46d0e5c
am: d5accfa7a8

Change-Id: Ib7b3d1f6e8e285e4bf8f49d36a83033301131a87