Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade JGit to 4.11.9.201909030838-r
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ibf68925f552e338c5aec67dcee5662a5699458e0
diff --git a/BUILD b/BUILD
index 2f873b7..8eb7d2a 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",