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

Change-Id: If684c3a4ae37dc20988015be7d90651500a5e380