Merge "Fix cts-tradefed script to work on MacOS" into oreo-mr1-cts-dev
am: 8c67beaad4

Change-Id: I9f77dc10a65a16a4b619f2b092abb10c506501e9