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

Change-Id: Ia7c9cc81aa76c4b4f465cf5a6b33884e2c5493fa