Merge "[Harness Separation] Fix some references to tools/cts-tradefed" into pi-dev am: a9781f4f33
am: 8e558c629f

Change-Id: Ib9a17ea6dacbe8b0dfe8efe8d812b3556504b175