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

Change-Id: Ic38750411316a1f9e743e9b4c97b13800d013f46