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

Change-Id: Ie6a8909be81a63ba032b0616fb8c2aa156c96d22