Merge branch 'stable-2.16'

* stable-2.16:
  Fix test dependencies for in-tree build

Change-Id: Ic9aa28c070b50fe670029ab001f19fa974a52176
diff --git a/BUILD b/BUILD
index 5f63156..64383ff 100644
--- a/BUILD
+++ b/BUILD
@@ -1,6 +1,7 @@
 load("//tools/bzl:junit.bzl", "junit_tests")
 load(
     "//tools/bzl:plugin.bzl",
+    "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
     "gerrit_plugin",
 )
@@ -82,7 +83,7 @@
     name = "gc-conductor__plugin_test_deps",
     testonly = 1,
     visibility = ["//visibility:public"],
-    exports = EXECUTOR_DEPS + PLUGIN_TEST_DEPS + [
+    exports = EXECUTOR_DEPS + PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
         ":gc-conductor__plugin",
         ":gc-executor_lib",
         "@byte-buddy//jar",