Merge "Only run the cts-tradefed-tests as part of cts-unit-tests"