Merge "Move tools related to Cts from test/suite_harness"