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

Change-Id: I379bf269c3a1d441ebc935e63d21ca988a5aad77