Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Ifa41e6fabd7c62bb0d56cb48f0ddea11f2c492d0