Merge "Add cts-tradefed and compatibility-host-util to general-tests" into oc-dev