Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I5ecfc9c7f58d6e77c65d579f8da0baadf4783ddd