Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Change-Id: I822955d5586174e8a0da83c0455b6e321ba44492