Merge "simpleperf: improve script interface."
am: 090785e4dd

Change-Id: I6536a2764eed1b614628028fccb6a79477208268