rbeasley-avgo

### Description of the bug: Since upgrading to Bazel 7, we've encountered numerous sporadic build failures. Most are covered by other GitHub issues, but AFAICT nobody's filed one about .jdeps...

Looks like more fallout from #640 . Suppose a `pkg_zip` with two inputs, a TreeArtifact and a file where their destinations overlap and are expected to be merged in the...

Suppose the following (loosely ripped from `tests/zip/BUILD`): ```starlark load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "REMOVE_BASE_DIRECTORY") load("@rules_pkg//pkg:zip.bzl", "pkg_zip") # load("...:directory.bzl", "directory") # something that creates a directory/treeartifact pkg_zip( name = "test_zip_tree_remove_base_directory", srcs = [":generate_tree_remove_base_directory"], )...