Merge "Simpleperf: fix flaky workload unit tests."