Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev