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

Change-Id: I92656052e5a76a06e024fd0e41f1e1c2bacf5961