Merge "simpleperf: fix mac build." am: 79489ecc52
am: 4f9fb69e85

Change-Id: I0ed289fe6c93e607a6d0186ee2d711ed1f11c722