Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ia91926e4d1bd0058adec79c27c6bcdc4addbbd50