Merge "simpleperf: update scripts to use binaries in bin/." am: 615135e145
am: 6046606f3e

Change-Id: I3fcd94dd7f4b4c4511463b8e6aba407e1c4c2359