Merge "simpleperf: Fix record_java_app test."