Merge "simpleperf: fix app_profiler.py." am: d98c857902 am: 5ea663c3ab
am: 545ee30d39

Change-Id: I1d1523e06c56959e89cffa0ba877188a2333975a