Clean up code that directly imports nested classes like Builder, Entry, etc.

PiperOrigin-RevId: 194999124

35 files changed, 217 insertions, 158 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index 389ac44ff1..ec2aafa235 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.ActionEnvironment;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.analysis.ShellConfiguration;
 import com.google.devtools.build.lib.analysis.ShellConfiguration.ShellExecutableProvider;
@@ -198,7 +197,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet BAZEL_SETUP =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           builder
               .setPrelude("//tools/build_rules:prelude_bazel")
               .setNativeLauncherLabel("//tools/launcher:launcher")
@@ -207,10 +206,11 @@ public class BazelRuleClassProvider {
               .setActionEnvironmentProvider(SHELL_ACTION_ENV);
 
           builder.addConfigurationOptions(ShellConfiguration.Options.class);
-          builder.addConfigurationFragment(new ShellConfiguration.Loader(
-              SHELL_EXECUTABLE,
-              ShellConfiguration.Options.class,
-              StrictActionEnvOptions.class));
+          builder.addConfigurationFragment(
+              new ShellConfiguration.Loader(
+                  SHELL_EXECUTABLE,
+                  ShellConfiguration.Options.class,
+                  StrictActionEnvOptions.class));
           builder.addUniversalConfigurationFragment(ShellConfiguration.class);
           builder.addConfigurationOptions(StrictActionEnvOptions.class);
           builder.addConfigurationOptions(BuildConfiguration.Options.class);
@@ -225,7 +225,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet PROTO_RULES =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           builder.addConfigurationOptions(ProtoConfiguration.Options.class);
           builder.addConfigurationFragment(new ProtoConfiguration.Loader());
           builder.addRuleDefinition(new BazelProtoLibraryRule());
@@ -241,7 +241,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet CPP_PROTO_RULES =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           CcProtoAspect ccProtoAspect = new BazelCcProtoAspect(BazelCppSemantics.INSTANCE, builder);
           builder.addNativeAspectClass(ccProtoAspect);
           builder.addRuleDefinition(new CcProtoLibraryRule(ccProtoAspect));
@@ -256,7 +256,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet JAVA_PROTO_RULES =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           LabelLateBoundDefault<?> hostJdkAttribute = JavaSemantics.hostJdkAttribute(builder);
           BazelJavaProtoAspect bazelJavaProtoAspect = new BazelJavaProtoAspect(hostJdkAttribute);
           BazelJavaLiteProtoAspect bazelJavaLiteProtoAspect =
@@ -276,7 +276,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet ANDROID_RULES =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           String toolsRepository = checkNotNull(builder.getToolsRepository());
 
           builder.addConfig(AndroidConfiguration.Options.class, new AndroidConfiguration.Loader());
@@ -336,7 +336,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet PYTHON_RULES =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           builder.addConfig(PythonOptions.class, new PythonConfigurationLoader());
           builder.addConfig(
               BazelPythonConfiguration.Options.class, new BazelPythonConfiguration.Loader());
@@ -358,7 +358,7 @@ public class BazelRuleClassProvider {
   public static final RuleSet VARIOUS_WORKSPACE_RULES =
       new RuleSet() {
         @Override
-        public void init(Builder builder) {
+        public void init(ConfiguredRuleClassProvider.Builder builder) {
           // TODO(ulfjack): Split this up by conceptual units.
           builder.addRuleDefinition(new GitRepositoryRule());
           builder.addRuleDefinition(new HttpArchiveRule());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java
index 7cb089da7e..787e1ee271 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/CcRules.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.bazel.rules;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.bazel.rules.CcToolchainType.CcToolchainTypeRule;
 import com.google.devtools.build.lib.bazel.rules.cpp.BazelCcBinaryRule;
@@ -47,7 +47,7 @@ public class CcRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     builder.addSkylarkAccessibleTopLevels("cc_common", CcModule.INSTANCE);
 
     builder.addConfig(CppOptions.class, new CppConfigurationLoader(CpuTransformer.IDENTITY));
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
index 321f4256f7..3bbc32e368 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.bazel.rules;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.analysis.constraints.EnvironmentRule;
 import com.google.devtools.build.lib.bazel.rules.common.BazelFilegroupRule;
@@ -36,7 +36,7 @@ public class GenericRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     builder.addRuleDefinition(new EnvironmentRule());
 
     builder.addRuleDefinition(new AliasRule());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/J2ObjcRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/J2ObjcRules.java
index f14dd9b879..1ab3647795 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/J2ObjcRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/J2ObjcRules.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.bazel.rules;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.rules.core.CoreRules;
 import com.google.devtools.build.lib.rules.objc.J2ObjcAspect;
@@ -32,7 +32,7 @@ public class J2ObjcRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     J2ObjcAspect j2ObjcAspect = new J2ObjcAspect(builder);
 
     builder.addNativeAspectClass(j2ObjcAspect);
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
index 776b436b54..05167303c8 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/JavaRules.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.bazel.rules;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaBinaryRule;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaBuildInfoFactory;
@@ -56,7 +56,7 @@ public class JavaRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     builder.addConfigurationOptions(JavaOptions.class);
     builder.addConfigurationFragment(new JavaConfigurationLoader());
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/ObjcRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/ObjcRules.java
index d740c0e4c8..712327040d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/ObjcRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/ObjcRules.java
@@ -16,7 +16,7 @@ package com.google.devtools.build.lib.bazel.rules;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions;
 import com.google.devtools.build.lib.rules.apple.AppleConfiguration;
@@ -57,7 +57,7 @@ public class ObjcRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     String toolsRepository = checkNotNull(builder.getToolsRepository());
 
     // objc_proto_library should go into a separate RuleSet!
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/ShRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/ShRules.java
index e49ee9609c..fd3d4e0823 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/ShRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/ShRules.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.bazel.rules;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.bazel.rules.sh.BazelShBinaryRule;
 import com.google.devtools.build.lib.bazel.rules.sh.BazelShLibraryRule;
@@ -33,7 +33,7 @@ public class ShRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     builder.addRuleDefinition(new BazelShRuleClasses.ShRule());
     builder.addRuleDefinition(new BazelShLibraryRule());
     builder.addRuleDefinition(new BazelShBinaryRule());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/ToolchainRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/ToolchainRules.java
index 98a23777b9..9810e153fa 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/ToolchainRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/ToolchainRules.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.bazel.rules;
 
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet;
 import com.google.devtools.build.lib.bazel.rules.BazelToolchainType.BazelToolchainTypeRule;
 import com.google.devtools.build.lib.bazel.rules.genrule.BazelGenRuleRule;
@@ -30,7 +30,7 @@ public class ToolchainRules implements RuleSet {
   }
 
   @Override
-  public void init(Builder builder) {
+  public void init(ConfiguredRuleClassProvider.Builder builder) {
     builder.addRuleDefinition(new BazelToolchainTypeRule());
     builder.addRuleDefinition(new GenRuleBaseRule());
     builder.addRuleDefinition(new BazelGenRuleRule());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java
index 7d3088029c..075048db82 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java
@@ -24,7 +24,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule;
 import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory;
@@ -45,7 +44,7 @@ public class AndroidNdkRepositoryRule implements RuleDefinition {
               Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:files"));
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
     return builder
         .setWorkspaceOnly()
         .setExternalBindingsFunction(BINDINGS_FUNCTION)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
index 244a7fcfe7..db85e59690 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java
@@ -24,7 +24,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule;
 import com.google.devtools.build.lib.rules.repository.WorkspaceConfiguredTargetFactory;
@@ -51,7 +50,7 @@ public class AndroidSdkRepositoryRule implements RuleDefinition {
       };
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
     return builder
         .setWorkspaceOnly()
         .setExternalBindingsFunction(BINDINGS_FUNCTION)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAarImportRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAarImportRule.java
index 0ddec97b1f..db7e47ded6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAarImportRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAarImportRule.java
@@ -17,7 +17,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses.JavaBaseRule;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.rules.android.AarImportBaseRule;
 
 /**
@@ -26,7 +25,7 @@ import com.google.devtools.build.lib.rules.android.AarImportBaseRule;
 public final class BazelAarImportRule implements RuleDefinition {
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
     return builder
         .removeAttribute("javacopts")
         .removeAttribute("plugins")
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
index 9506947c91..d37837389f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
@@ -18,7 +18,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppRuleClasses;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.rules.android.AndroidFeatureFlagSetProvider;
 import com.google.devtools.build.lib.rules.android.AndroidRuleClasses;
 import com.google.devtools.build.lib.rules.config.ConfigFeatureFlagTransitionFactory;
@@ -30,7 +29,7 @@ import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
 public class BazelAndroidBinaryRule implements RuleDefinition {
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
     return builder
         /* <!-- #BLAZE_RULE(android_binary).IMPLICIT_OUTPUTS -->
          <ul>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java
index 866df7ed16..c7651cd08a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLibraryRule.java
@@ -18,7 +18,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.rules.android.AndroidLibraryBaseRule;
 import com.google.devtools.build.lib.rules.android.AndroidRuleClasses;
 import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
@@ -29,7 +28,7 @@ import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
 public class BazelAndroidLibraryRule implements RuleDefinition {
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
     return builder
         /* <!-- #BLAZE_RULE(android_library).IMPLICIT_OUTPUTS -->
         <ul>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java
index 06b6d308a8..685562d738 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTest.java
@@ -26,7 +26,7 @@ import com.google.devtools.build.lib.rules.android.AndroidLocalTestBase;
 import com.google.devtools.build.lib.rules.android.AndroidMigrationSemantics;
 import com.google.devtools.build.lib.rules.android.AndroidSemantics;
 import com.google.devtools.build.lib.rules.java.JavaCommon;
-import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts.Builder;
+import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts;
 import com.google.devtools.build.lib.rules.java.JavaCompilationHelper;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
 import com.google.devtools.build.lib.rules.java.JavaTargetAttributes;
@@ -75,7 +75,7 @@ public class BazelAndroidLocalTest extends AndroidLocalTestBase {
       JavaCompilationHelper helper,
       Artifact executable,
       Artifact instrumentationMetadata,
-      Builder javaArtifactsBuilder,
+      JavaCompilationArtifacts.Builder javaArtifactsBuilder,
       JavaTargetAttributes.Builder attributesBuilder)
       throws InterruptedException, RuleErrorException {
     // coverage does not yet work with android_local_test
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
index 9ad579650c..723f7ad8b5 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses.BaseJavaBinaryRule;
 import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
 import com.google.devtools.build.lib.packages.TriState;
@@ -59,7 +58,7 @@ public class BazelAndroidLocalTestRule implements RuleDefinition {
       JavaSemantics.JAVA_BINARY_DEPLOY_JAR);
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
     return builder
         .requiresConfigurationFragments(JavaConfiguration.class)
         .setImplicitOutputsFunction(ANDROID_ROBOLECTRIC_IMPLICIT_OUTPUTS)
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
index cf7ba3c48e..e98d28808d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java
@@ -25,7 +25,7 @@ import com.google.devtools.build.lib.rules.android.AndroidConfiguration;
 import com.google.devtools.build.lib.rules.android.AndroidSemantics;
 import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
-import com.google.devtools.build.lib.rules.java.JavaTargetAttributes.Builder;
+import com.google.devtools.build.lib.rules.java.JavaTargetAttributes;
 import com.google.devtools.build.lib.rules.java.ProguardHelper.ProguardOutput;
 
 /**
@@ -65,10 +65,13 @@ public class BazelAndroidSemantics implements AndroidSemantics {
   }
 
   @Override
-  public void addCoverageSupport(RuleContext ruleContext, AndroidCommon common,
-      JavaSemantics javaSemantics, boolean forAndroidTest, Builder attributes,
-      JavaCompilationArtifacts.Builder artifactsBuilder) {
-  }
+  public void addCoverageSupport(
+      RuleContext ruleContext,
+      AndroidCommon common,
+      JavaSemantics javaSemantics,
+      boolean forAndroidTest,
+      JavaTargetAttributes.Builder attributes,
+      JavaCompilationArtifacts.Builder artifactsBuilder) {}
 
   @Override
   public ImmutableList<String> getAttributesWithJavaRuntimeDeps(RuleContext ruleContext) {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
index 59788c7160..a18b8f4313 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaBinaryRule.java
@@ -25,7 +25,6 @@ import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses.BaseJ
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.AttributeMap;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration;
@@ -35,7 +34,7 @@ import com.google.devtools.build.lib.rules.java.JavaConfiguration;
  */
 public final class BazelJavaBinaryRule implements RuleDefinition {
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
     /* <!-- #BLAZE_RULE(java_binary).NAME -->
     <br/>It is good practice to use the name of the source file that is the main entry point of the
     application (minus the extension). For example, if your entry point is called
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
index 4b9601b00d..13365cbb0e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaImportRule.java
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.rules.java.JavaImportBaseRule;
 import com.google.devtools.build.lib.rules.java.JavaRuleClasses.IjarBaseRule;
 import com.google.devtools.build.lib.rules.java.JavaSemantics;
@@ -37,7 +36,7 @@ public final class BazelJavaImportRule implements RuleDefinition {
       ImmutableSet.of("java_library", "java_import", "cc_library", "cc_binary");
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
     return builder
         /* <!-- #BLAZE_RULE(java_import).ATTRIBUTE(deps) -->
         The list of other libraries to be linked in to the target.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
index c2a040f445..1c6f6d7882 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
@@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.config.ConfigAwareRuleClassBuilder
 import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses.JavaRule;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
@@ -39,7 +38,7 @@ import com.google.devtools.build.lib.rules.java.ProguardLibraryRule;
  */
 public final class BazelJavaLibraryRule implements RuleDefinition {
   @Override
-  public RuleClass build(Builder builder, final RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, final RuleDefinitionEnvironment env) {
 
     return ConfigAwareRuleClassBuilder.of(builder)
         // For getting the host Java executable.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java
index 8749a70a41..d5edeea8aa 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaPluginRule.java
@@ -23,14 +23,13 @@ import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 
 /**
  * Rule definition for the java_plugin rule.
  */
 public final class BazelJavaPluginRule implements RuleDefinition {
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
     return builder
         /* <!-- #BLAZE_RULE(java_plugin).IMPLICIT_OUTPUTS -->
         <ul>
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
index 60c07471fe..33076bc7ce 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
@@ -39,7 +39,6 @@ import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
 import com.google.devtools.build.lib.packages.PredicateWithMessage;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.RuleClass.PackageNameConstraint;
 import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
@@ -91,7 +90,7 @@ public class BazelJavaRuleClasses {
    */
   public static final class JavaBaseRule implements RuleDefinition {
     @Override
-    public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+    public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
       return builder
           .add(attr(":jvm", LABEL)
               .value(JavaSemantics.jvmAttribute(env))
@@ -134,7 +133,7 @@ public class BazelJavaRuleClasses {
    */
   public static final class JavaRule implements RuleDefinition {
     @Override
-    public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+    public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
       return builder
           /* <!-- #BLAZE_RULE($java_rule).ATTRIBUTE(deps) -->
           The list of other libraries to be linked in to the target.
@@ -287,7 +286,7 @@ public class BazelJavaRuleClasses {
   public static final class BaseJavaBinaryRule implements RuleDefinition {
 
     @Override
-    public RuleClass build(Builder builder, final RuleDefinitionEnvironment env) {
+    public RuleClass build(RuleClass.Builder builder, final RuleDefinitionEnvironment env) {
       Label launcher = env.getLauncherLabel();
       if (launcher != null) {
         builder.add(attr("$launcher", LABEL).cfg(HostTransition.INSTANCE).value(launcher));
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
index f8dc9f3133..ebb64f29ca 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.analysis.config.HostTransition;
 import com.google.devtools.build.lib.bazel.rules.java.BazelJavaRuleClasses.BaseJavaBinaryRule;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.TriState;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
@@ -41,7 +40,7 @@ import com.google.devtools.build.lib.rules.java.JavaSemantics;
 public final class BazelJavaTestRule implements RuleDefinition {
 
   @Override
-  public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
+  public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
     /* <!-- #BLAZE_RULE(java_test).IMPLICIT_OUTPUTS -->
     <ul>
       <li><code><var>name</var>.jar</code>: A Java archive.</li>
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
index 8c68b2655e..6e1679c277 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/ActionGraphDump.java
@@ -38,7 +38,7 @@ import com.google.devtools.build.lib.packages.AspectDescriptor;
 import com.google.devtools.build.lib.skyframe.AspectValue;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -106,7 +106,7 @@ public class ActionGraphDump {
       // TODO(twerth): This handles the fixed environment. We probably want to output the inherited
       // environment as well.
       ImmutableMap<String, String> fixedEnvironment = spawnAction.getEnvironment();
-      for (Entry<String, String> environmentVariable : fixedEnvironment.entrySet()) {
+      for (Map.Entry<String, String> environmentVariable : fixedEnvironment.entrySet()) {
         AnalysisProtos.KeyValuePair.Builder keyValuePairBuilder =
             AnalysisProtos.KeyValuePair.newBuilder();
         keyValuePairBuilder
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java
index cf72c320df..7988cf25d8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownArtifacts.java
@@ -15,14 +15,14 @@ package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 
 /**
  * Cache for Artifacts in the action graph.
  */
 public class KnownArtifacts extends BaseCache<Artifact, AnalysisProtos.Artifact> {
 
-  KnownArtifacts(Builder actionGraphBuilder) {
+  KnownArtifacts(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java
index 137d553563..e998ac4667 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownAspectDescriptors.java
@@ -14,10 +14,10 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.analysis.AnalysisProtos.KeyValuePair;
 import com.google.devtools.build.lib.packages.AspectDescriptor;
-import java.util.Map.Entry;
+import java.util.Map;
 
 /**
  * Cache for AspectDescriptors in the action graph.
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
 public class KnownAspectDescriptors
     extends BaseCache<AspectDescriptor, AnalysisProtos.AspectDescriptor> {
 
-  KnownAspectDescriptors(Builder actionGraphBuilder) {
+  KnownAspectDescriptors(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
@@ -35,7 +35,7 @@ public class KnownAspectDescriptors
         AnalysisProtos.AspectDescriptor.newBuilder()
             .setId(id)
             .setName(aspectDescriptor.getAspectClass().getName());
-    for (Entry<String, String> parameter :
+    for (Map.Entry<String, String> parameter :
         aspectDescriptor.getParameters().getAttributes().entries()) {
       KeyValuePair.Builder keyValuePairBuilder = KeyValuePair.newBuilder();
       keyValuePairBuilder.setKey(parameter.getKey()).setValue(parameter.getValue());
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java
index 6083d0bac3..59626a73a6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownConfigurations.java
@@ -14,14 +14,14 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.buildeventstream.BuildEvent;
 import com.google.devtools.build.lib.buildeventstream.BuildEventStreamProtos;
 
 /** Cache for BuildConfigurations in the action graph. */
 public class KnownConfigurations extends BaseCache<BuildEvent, AnalysisProtos.Configuration> {
 
-  KnownConfigurations(Builder actionGraphBuilder) {
+  KnownConfigurations(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java
index ccd433cca5..59e49eb9ff 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownNestedSets.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
 
 /**
@@ -24,7 +24,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetView;
 public class KnownNestedSets extends BaseCache<Object, AnalysisProtos.DepSetOfFiles> {
   private final KnownArtifacts knownArtifacts;
 
-  KnownNestedSets(Builder actionGraphBuilder, KnownArtifacts knownArtifacts) {
+  KnownNestedSets(ActionGraphContainer.Builder actionGraphBuilder, KnownArtifacts knownArtifacts) {
     super(actionGraphBuilder);
     this.knownArtifacts = knownArtifacts;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java
index 0b0eb6d05c..dd603dca5a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleClassStrings.java
@@ -14,14 +14,14 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 
 /**
  * Cache for RuleClassStrings in the action graph.
  */
 public class KnownRuleClassStrings extends BaseCache<String, AnalysisProtos.RuleClass> {
 
-  KnownRuleClassStrings(Builder actionGraphBuilder) {
+  KnownRuleClassStrings(ActionGraphContainer.Builder actionGraphBuilder) {
     super(actionGraphBuilder);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java
index afa52ce57e..12005f5b34 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/actiongraph/KnownRuleConfiguredTargets.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.skyframe.actiongraph;
 
 import com.google.devtools.build.lib.analysis.AnalysisProtos;
-import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer.Builder;
+import com.google.devtools.build.lib.analysis.AnalysisProtos.ActionGraphContainer;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
 import com.google.devtools.build.lib.cmdline.Label;
 
@@ -26,7 +26,8 @@ public class KnownRuleConfiguredTargets
 
   private final KnownRuleClassStrings knownRuleClassStrings;
 
-  KnownRuleConfiguredTargets(Builder actionGraphBuilder,
+  KnownRuleConfiguredTargets(
+      ActionGraphContainer.Builder actionGraphBuilder,
       KnownRuleClassStrings knownRuleClassStrings) {
     super(actionGraphBuilder);
     this.knownRuleClassStrings = knownRuleClassStrings;
diff --git a/src/test/java/com/google/devtools/build/android/AarGeneratorActionTest.java b/src/test/java/com/google/devtools/build/android/AarGeneratorActionTest.java
index 6d1729769d..ae40dd3592 100644
--- a/src/test/java/com/google/devtools/build/android/AarGeneratorActionTest.java
+++ b/src/test/java/com/google/devtools/build/android/AarGeneratorActionTest.java
@@ -37,7 +37,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -184,7 +183,7 @@ public class AarGeneratorActionTest {
         if (withEmptyAssets) {
           Files.createDirectories(assetDir);
         }
-        for (Entry<Path, String> entry : filesToWrite.entrySet()) {
+        for (Map.Entry<Path, String> entry : filesToWrite.entrySet()) {
           Path file = entry.getKey();
           // only write files in assets if assets has not been set to empty and same for resources
           if (!((file.startsWith(assetDir) && withEmptyAssets)
@@ -202,7 +201,7 @@ public class AarGeneratorActionTest {
       private void writeClassesJar() throws IOException {
         final ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(classes.toFile()));
 
-        for (Entry<String, String> file : classesToWrite.entrySet()) {
+        for (Map.Entry<String, String> file : classesToWrite.entrySet()) {
           ZipEntry entry = new ZipEntry(file.getKey());
           zout.putNextEntry(entry);
           zout.write(file.getValue().getBytes(UTF_8));
diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java b/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java
index 5e64ef4b9b..7e55e3e37d 100644
--- a/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java
+++ b/src/test/java/com/google/devtools/build/android/AndroidDataBuilder.java
@@ -25,7 +25,6 @@ import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * Utility for building {@link UnvalidatedAndroidData}, {@link ParsedAndroidData},
@@ -99,7 +98,7 @@ public class AndroidDataBuilder {
   public AndroidDataBuilder addValuesWithAttributes(
       String path, Map<String, String> attributes, String... lines) {
     ImmutableList.Builder<String> attributeBuilder = ImmutableList.builder();
-    for (Entry<String, String> attribute : attributes.entrySet()) {
+    for (Map.Entry<String, String> attribute : attributes.entrySet()) {
       if (attribute.getKey() != null && attribute.getValue() != null) {
         attributeBuilder.add(String.format("%s=\"%s\"", attribute.getKey(), attribute.getValue()));
       }
@@ -173,12 +172,12 @@ public class AndroidDataBuilder {
     Files.createDirectories(assetDir);
     Files.createDirectories(resourceDir);
     Preconditions.checkNotNull(manifest, "A manifest is required.");
-    for (Entry<Path, String> entry : filesToWrite.entrySet()) {
+    for (Map.Entry<Path, String> entry : filesToWrite.entrySet()) {
       Files.createDirectories(entry.getKey().getParent());
       Files.write(entry.getKey(), entry.getValue().getBytes(StandardCharsets.UTF_8));
       Preconditions.checkArgument(Files.exists(entry.getKey()));
     }
-    for (Entry<Path, Path> entry : filesToCopy.entrySet()) {
+    for (Map.Entry<Path, Path> entry : filesToCopy.entrySet()) {
       Path target = entry.getKey();
       Path source = entry.getValue();
       Files.createDirectories(target.getParent());
diff --git a/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java b/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java
index 80bf3386b1..422eac18ba 100644
--- a/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java
+++ b/src/test/java/com/google/devtools/build/android/AndroidDataMergerTest.java
@@ -29,7 +29,6 @@ import com.google.devtools.build.android.AndroidDataMerger.SourceChecker;
 import com.google.devtools.build.android.xml.IdXmlResourceValue;
 import com.google.devtools.build.android.xml.PublicXmlResourceValue;
 import com.google.devtools.build.android.xml.SimpleXmlResourceValue;
-import com.google.devtools.build.android.xml.SimpleXmlResourceValue.Type;
 import com.google.devtools.build.android.xml.StyleableXmlResourceValue;
 import java.io.IOException;
 import java.nio.file.FileSystem;
@@ -88,7 +87,9 @@ public class AndroidDataMergerTest {
                 file("layout/exit").source("res/layout/exit.xml"),
                 xml("string/exit")
                     .source(directStrings)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .combining(xml("id/exit").source("values/ids.xml").value(IdXmlResourceValue.of()))
             .build();
 
@@ -111,7 +112,9 @@ public class AndroidDataMergerTest {
                 .overwritable(
                     xml("string/exit")
                         .source(primaryStrings.overwrite(directStrings))
-                        .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                        .value(
+                            SimpleXmlResourceValue.createWithValue(
+                                SimpleXmlResourceValue.Type.STRING, "way out")))
                 .build(),
             ParsedAndroidDataBuilder.buildOn(fqnFactory)
                 .overwritable(file("layout/exit").root(directRoot).source("res/layout/exit.xml"))
@@ -147,7 +150,9 @@ public class AndroidDataMergerTest {
                 file("layout/exit").source("res/layout/exit.xml"),
                 xml("string/exit")
                     .source(directString)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .combining(xml("id/exit").source("values/ids.xml").value(IdXmlResourceValue.of()))
             .build();
 
@@ -171,7 +176,9 @@ public class AndroidDataMergerTest {
                     xml("string/exit")
                         .root(primaryRoot)
                         .source(primaryString.overwrite(directString))
-                        .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                        .value(
+                            SimpleXmlResourceValue.createWithValue(
+                                SimpleXmlResourceValue.Type.STRING, "way out")))
                 .build(),
             ParsedAndroidDataBuilder.buildOn(fqnFactory)
                 .overwritable(
@@ -212,7 +219,9 @@ public class AndroidDataMergerTest {
                 file("layout/exit").source("res/layout/exit.xml"),
                 xml("string/exit")
                     .source(directStrings)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .combining(xml("id/exit").source("values/ids.xml").value(IdXmlResourceValue.of()))
             .build();
 
@@ -235,7 +244,9 @@ public class AndroidDataMergerTest {
                 .overwritable(
                     xml("string/exit")
                         .source(primaryString.overwrite(directStrings))
-                        .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                        .value(
+                            SimpleXmlResourceValue.createWithValue(
+                                SimpleXmlResourceValue.Type.STRING, "way out")))
                 .build(),
             ParsedAndroidDataBuilder.buildOn(fqnFactory)
                 .overwritable(
@@ -263,10 +274,14 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")),
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -284,10 +299,12 @@ public class AndroidDataMergerTest {
                     fqnFactory.parse("string/exit"),
                     DataResourceXml.createWithNoNamespace(
                         directRoot.resolve("res/values/strings.xml"),
-                        SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")),
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")),
                     DataResourceXml.createWithNoNamespace(
                         directRoot.resolve("res/values/strings.xml"),
-                        SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
                 .toConflictMessage());
   }
 
@@ -304,10 +321,14 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "way out")),
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -335,7 +356,9 @@ public class AndroidDataMergerTest {
                         xml("string/exit")
                             .root(directRoot)
                             .source("values/strings.xml")
-                            .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                            .value(
+                                SimpleXmlResourceValue.createWithValue(
+                                    SimpleXmlResourceValue.Type.STRING, "way out")))
                     .build()));
   }
 
@@ -352,13 +375,19 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "way out")),
                 xml("string/exit")
                     .source("values/more_strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "way out")),
                 xml("string/another_key")
                     .source("values/more_strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "another way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "another way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -387,10 +416,14 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source(directStrings)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")),
                 xml("string/exit")
                     .source(directStrings)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -410,7 +443,9 @@ public class AndroidDataMergerTest {
                 .overwritable(
                     xml("string/exit")
                         .source(primaryStrings.overwrite(directStrings))
-                        .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                        .value(
+                            SimpleXmlResourceValue.createWithValue(
+                                SimpleXmlResourceValue.Type.STRING, "way out")))
                 .build(),
             ParsedAndroidDataBuilder.empty());
     assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected);
@@ -427,10 +462,14 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")),
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     ParsedAndroidData directDependency = ParsedAndroidDataBuilder.empty();
@@ -450,10 +489,12 @@ public class AndroidDataMergerTest {
                     fqnFactory.parse("string/exit"),
                     DataResourceXml.createWithNoNamespace(
                         transitiveRoot.resolve("res/values/strings.xml"),
-                        SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")),
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")),
                     DataResourceXml.createWithNoNamespace(
                         transitiveRoot.resolve("res/values/strings.xml"),
-                        SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
                 .toConflictMessage());
   }
 
@@ -470,11 +511,15 @@ public class AndroidDataMergerTest {
                 xml("string/exit")
                     .root(transitiveRoot.resolve("1"))
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")),
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")),
                 xml("string/exit")
                     .root(transitiveRoot.resolve("2"))
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     ParsedAndroidData directDependency =
@@ -498,7 +543,9 @@ public class AndroidDataMergerTest {
                     xml("string/exit")
                         .root(primaryRoot)
                         .source("values/strings.xml")
-                        .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                        .value(
+                            SimpleXmlResourceValue.createWithValue(
+                                SimpleXmlResourceValue.Type.STRING, "way out")))
                 .build(),
             ParsedAndroidDataBuilder.empty());
     assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected);
@@ -515,7 +562,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     ParsedAndroidData directDependency =
@@ -523,7 +572,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -540,10 +591,12 @@ public class AndroidDataMergerTest {
                     fqnFactory.parse("string/exit"),
                     DataResourceXml.createWithNoNamespace(
                         directRoot.resolve("res/values/strings.xml"),
-                        SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")),
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")),
                     DataResourceXml.createWithNoNamespace(
                         transitiveRoot.resolve("res/values/strings.xml"),
-                        SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
                 .toConflictMessage());
   }
 
@@ -558,7 +611,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     ParsedAndroidData directDependency =
@@ -566,7 +621,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -584,13 +641,15 @@ public class AndroidDataMergerTest {
     assertThat(loggingHandler.warnings)
         .containsExactly(
             MergeConflict.of(
-                fullyQualifiedName,
-                DataResourceXml.createWithNoNamespace(
-                    directRoot.resolve("res/values/strings.xml"),
-                    SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")),
-                DataResourceXml.createWithNoNamespace(
-                    transitiveRoot.resolve("res/values/strings.xml"),
-                    SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                    fullyQualifiedName,
+                    DataResourceXml.createWithNoNamespace(
+                        directRoot.resolve("res/values/strings.xml"),
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")),
+                    DataResourceXml.createWithNoNamespace(
+                        transitiveRoot.resolve("res/values/strings.xml"),
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
                 .toConflictMessage());
   }
 
@@ -605,7 +664,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     ParsedAndroidData directDependency =
@@ -613,7 +674,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source("values/strings.xml")
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -648,7 +711,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source(transitiveStrings)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "no way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "no way out")))
             .build();
 
     ParsedAndroidData directDependency =
@@ -656,7 +721,9 @@ public class AndroidDataMergerTest {
             .overwritable(
                 xml("string/exit")
                     .source(directStrings)
-                    .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "wrong way out")))
+                    .value(
+                        SimpleXmlResourceValue.createWithValue(
+                            SimpleXmlResourceValue.Type.STRING, "wrong way out")))
             .build();
 
     UnvalidatedAndroidData primary =
@@ -677,7 +744,9 @@ public class AndroidDataMergerTest {
                 .overwritable(
                     xml("string/exit")
                         .source(primaryStrings.overwrite(directStrings))
-                        .value(SimpleXmlResourceValue.createWithValue(Type.STRING, "way out")))
+                        .value(
+                            SimpleXmlResourceValue.createWithValue(
+                                SimpleXmlResourceValue.Type.STRING, "way out")))
                 .build(),
             ParsedAndroidDataBuilder.empty());
     assertAbout(unwrittenMergedAndroidData).that(data).isEqualTo(expected);
diff --git a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
index aa91bf91c3..937f2ff399 100644
--- a/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
+++ b/src/test/java/com/google/devtools/build/android/DataResourceXmlTest.java
@@ -57,7 +57,6 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import javax.xml.stream.XMLStreamException;
 import org.junit.Before;
 import org.junit.Test;
@@ -91,7 +90,7 @@ public class DataResourceXmlTest {
     Files.createDirectories(values.getParent());
     StringBuilder builder = new StringBuilder();
     builder.append(AndroidDataWriter.PRELUDE).append("<resources");
-    for (Entry<String, String> entry : namespaces.entrySet()) {
+    for (Map.Entry<String, String> entry : namespaces.entrySet()) {
       builder
           .append(" xmlns:")
           .append(entry.getKey())
@@ -99,7 +98,7 @@ public class DataResourceXmlTest {
           .append(entry.getValue())
           .append("\"");
     }
-    for (Entry<String, String> entry : attributes.entrySet()) {
+    for (Map.Entry<String, String> entry : attributes.entrySet()) {
       builder
           .append(" ")
           .append(entry.getKey())
@@ -1280,28 +1279,30 @@ public class DataResourceXmlTest {
 
   private String[] resourcesXmlFrom(Map<String, String> namespaces, Map<String, String> attributes,
       Path source, String... lines) {
-    FluentIterable<String> xml = FluentIterable.of(new String(AndroidDataWriter.PRELUDE))
-        .append("<resources")
-        .append(
-            FluentIterable.from(namespaces.entrySet())
-                .transform(
-                    new Function<Entry<String, String>, String>() {
-                      @Override
-                      public String apply(Entry<String, String> input) {
-                        return String.format(" xmlns:%s=\"%s\"", input.getKey(), input.getValue());
-                      }
-                    })
-                .join(Joiner.on("")))
-        .append(
-            FluentIterable.from(attributes.entrySet())
-                .transform(
-                    new Function<Entry<String, String>, String>() {
-                      @Override
-                      public String apply(Entry<String, String> input) {
-                        return String.format(" %s=\"%s\"", input.getKey(), input.getValue());
-                      }
-                    })
-                .join(Joiner.on("")));
+    FluentIterable<String> xml =
+        FluentIterable.of(new String(AndroidDataWriter.PRELUDE))
+            .append("<resources")
+            .append(
+                FluentIterable.from(namespaces.entrySet())
+                    .transform(
+                        new Function<Map.Entry<String, String>, String>() {
+                          @Override
+                          public String apply(Map.Entry<String, String> input) {
+                            return String.format(
+                                " xmlns:%s=\"%s\"", input.getKey(), input.getValue());
+                          }
+                        })
+                    .join(Joiner.on("")))
+            .append(
+                FluentIterable.from(attributes.entrySet())
+                    .transform(
+                        new Function<Map.Entry<String, String>, String>() {
+                          @Override
+                          public String apply(Map.Entry<String, String> input) {
+                            return String.format(" %s=\"%s\"", input.getKey(), input.getValue());
+                          }
+                        })
+                    .join(Joiner.on("")));
     if (source == null && (lines == null || lines.length == 0)) {
       xml = xml.append("/>");
     } else {
diff --git a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java
index 160978b98e..75857ae43c 100644
--- a/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java
+++ b/src/test/java/com/google/devtools/build/android/ManifestMergerActionTest.java
@@ -33,7 +33,6 @@ import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import javax.annotation.Nullable;
 import org.junit.Before;
 import org.junit.Test;
@@ -265,9 +264,9 @@ public class ManifestMergerActionTest {
 
   private <K, V> String mapToDictionaryString(Map<K, V> map) {
     StringBuilder sb = new StringBuilder();
-    Iterator<Entry<K, V>> iter = map.entrySet().iterator();
+    Iterator<Map.Entry<K, V>> iter = map.entrySet().iterator();
     while (iter.hasNext()) {
-      Entry<K, V> entry = iter.next();
+      Map.Entry<K, V> entry = iter.next();
       sb.append(entry.getKey().toString().replace(":", "\\:").replace(",", "\\,"));
       sb.append(':');
       sb.append(entry.getValue().toString().replace(":", "\\:").replace(",", "\\,"));
diff --git a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java
index 07c6fa42a6..e6a1b407d1 100644
--- a/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java
+++ b/src/test/java/com/google/devtools/build/android/ParsedAndroidDataSubject.java
@@ -20,7 +20,7 @@ import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.Subject;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 
 /** Testing Subject for comparing ParsedAndroidData instances. */
 class ParsedAndroidDataSubject extends Subject<ParsedAndroidDataSubject, ParsedAndroidData> {
@@ -49,8 +49,8 @@ class ParsedAndroidDataSubject extends Subject<ParsedAndroidDataSubject, ParsedA
   }
 
   private <T extends DataValue> void compareDataValues(
-      Iterable<Entry<DataKey, T>> actual,
-      Iterable<Entry<DataKey, T>> expected,
+      Iterable<Map.Entry<DataKey, T>> actual,
+      Iterable<Map.Entry<DataKey, T>> expected,
       List<String> out,
       String valueType) {
     List<String> errors = new ArrayList<>();