Merge "simpleperf: fix unknown binary in samples." am: 8bc6d740bd am: b06d9a0116
am: 2abc0dafae

Change-Id: I2190ad7e8b9c61388b6312a5df306557371dff89