Merge "simpleperf: use app_profiler.py in inferno." am: c2adeafb3c
am: 6918695687

Change-Id: Id470ce14f761c2778ae72d63653b82c1bf66bf66