Merge "simpleperf: fix mac build."
am: c583d20f1a

Change-Id: Ib14fdb106d79b5377fbf639f17abb058ad3fd1c5