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

Change-Id: I7d39b74fd509de6eeaabc558d89f12ff846af282