Merge "Fix cts-tradefed script to work on MacOS" into oreo-mr1-cts-dev