Merge "simpleperf: Fix record_java_app test." am: 7681d5f0f8

Change-Id: Ifaeb0eac5029796acd54ecedbc0bb650d8b871ad