Merge "Add cts-tradefed to cts build." into honeycomb