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

Change-Id: Ib4245d4d936ea836c94f83b72c98aa0d3be47cbc