Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: Ibecf2238b06af2ec8bde2480ea4c7aa4d651e525

GerritCodeReview/plugins_gitiles