Merge "simpleperf: fix mac build." am: 79489ecc52 am: 4f9fb69e85
am: 617ab01275

Change-Id: I94bd8e0b9b92b442d4d6f1894354518356bf2275