Merge "simpleperf: fix recording Java code with -p option."