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

Change-Id: I4b705328ec2a034023c9e4d95a786f829423e1a6