Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Remove unnecessary 'include =' on java_library src parameter

Change-Id: Ia95f1be2350e666128bbfe45a00a4c6e4174db1d