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