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

Change-Id: I3888575822ddd46b57320847434408327d885f0f