Merge "simpleperf: fix scripts." am: 1ed0c279d8 am: c54e1e98e6
am: d6858d7115

Change-Id: Ib0a47114db42db449cd85f6b4ed8719bf932deaa