Merge "Change CTS hardware package name in tradefed, pt2"