Merge "simpleperf: fix test running on emulator." am: c4cc418343 am: 17073e6b27

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2025608

Change-Id: I3bcbcc0157127537aba246cdb5f9b5a33c9b5c8f