Merge "Set correct JAVA_BINARY for vts-tradefed" into main