Merge "simpleperf: Fix flaky tests when running in emulator" into main