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

Change-Id: Ic37a284ddb1e50a797a55a94890edc237026c55e