Merge \"simpleperf: fix mac build.\"
am: 898b3f48e2

Change-Id: I92ea3c4aea4ec7426770a49c313223b52fd2d807