Merge "simpleperf: fix app_profiler.py."
am: f4f68176b3

Change-Id: If1e79e2ef0e6e92cf3c4eb92ef9daf3cb722117b