Merge "simpleperf add more script tests." am: 4ba39d11d3 am: afd073f95c
am: ec588226d2

Change-Id: I7c5e99bdd1b3fe581d2cb2ebd41620361dde7e58