Merge "Fix errors running on Mac OS" am: f8ecf74ab0 am: acaaecd920 am: 5888f6afa6 am: 58ea7f639e

Original change: https://android-review.googlesource.com/c/platform/test/mlts/benchmark/+/1396547

Change-Id: I1c89be6dc6dcf28a7d00074d3d0c5e7d8e968240