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