Merge "simpleperf: fix mac build." am: c583d20f1a am: 27d150feee
am: 0668fce299

Change-Id: Ia85203b142a669867f5eab2446a6a4ee59ffdbbd