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

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

Change-Id: Ib833da19f32b4bb8c23d0bb94f0da6ca82215de6