Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ifeb02ed6bc9a1c2383a0a7bef9b6eb0b71a1e12d