Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Bazel: Remove unnecessary 'include =' on java_library src parameter Change-Id: I478a2a8e818f68561d6c0be3bbab7b5f918c6b59

diff --git a/BUILD b/BUILD
index 0a62564..3a5a223 100644
--- a/BUILD
+++ b/BUILD

@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 load("//tools/bzl:junit.bzl", "junit_tests")
 load("//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "gerrit_plugin")
 
@@ -23,7 +24,7 @@
     name = "testutils",
     testonly = 1,
     srcs = glob(
-        include = ["src/test/java/**/*.java"],
+        ["src/test/java/**/*.java"],
         exclude = [TEST_SRCS],
     ),
     deps = TEST_DEPS,