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

Change-Id: I146bc266d7570124bd9423b42e2ecbf39c0f6ed3