Merge \"Generate output of simpleperf in csv format\"
am: 3c614cb52d

Change-Id: Ib9dc3e74de66bb9bff2081ac13e4185a1a0c2149