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

Change-Id: I4859d97d817d4cac6faa38a22815f231b9ed3f52