Merge "simpleperf: fix app_profiler.py." am: f4f68176b3 am: 7ac7c486df
am: b396fbccef

Change-Id: I9b6db3b74fb389dec6556d3630d6fc80d289eb62