Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Ic537d1b9f7883ff3fc64022b4dc135c9d7f87f7c