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

Change-Id: Ie9a0eb6dfe54d7eda927edd6afceedcd181de09c