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

Change-Id: If8e41e3d36c16fe3a9a5e9854b6b24ef8e4ab7e9