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

Change-Id: Ib44a00e2089fb67274af449b38c09b676a84b559