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

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

Change-Id: I80bd25f18c713e4fa91d22d5012620e616577d83