Merge "simpleperf: merge jitted and interpreted java methods."
am: bf9f91a149

Change-Id: Iad4f3daffa1cf3cf315a0e6de4575fdf04b19b5c