Merge change 26741 into eclair

* changes:
  Add workaround to runtest to build cts dependencies.