Merge "simpleperf: fix mac build." am: 116d229784 am: 190ea5fba2 am: 58d04b9967

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1946130

Change-Id: I619a41087ec7fb1ac5135e0307ab114dcbe1488f