Merge "simpleperf: fix mac build." am: f265522c28 am: 865b4fddf1
am: 15d9e2ad9c

Change-Id: I275a2a8252790fb5c4b7b7afd84de34b9160895f