Merge "cts-tradefed: fix incorrect hardcoded usage of /out/"