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