Merge "simpleperf: fix mac build." am: 7fbdf7e9d3 am: 122ac4bd8e
am: d651291837

Change-Id: If6408614c70e9e706a39b1b692fc38e1cb689e87