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

Change-Id: I367d41448d559c04942f03b915c57cb9d460aa1a