Merge "simpleperf: fix test running on emulator." am: c4cc418343 am: 17073e6b27 am: 14d17ec077 am: 1f5152d3d0 am: ef33e93613

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

Change-Id: Iff882a50abc7f6c13de153ada59009a0c3d5bc68