Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I4146c59cd3b522dab8af3a4a2ad2c5949b0be1b5