Merge "simpleperf: Fix flaky test record_cmd.record_java_app"