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

Change-Id: I670261f16bf0e6d5b98b179756a9abf96b4c1600