Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ic45716ae4b5cc9a6e5060f3f53f36ef0f7192232