Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: I4592079882b1f71d90f85d05a32f777971afaa46

BUILD

diff --git a/BUILD b/BUILD
index 86eef59..b0ec26b 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",