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

Change-Id: I59b6c59127e738ae509b4e76ad127352c4980096