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

PiperOrigin-RevId: 195040539

2 files changed, 4 insertions, 5 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java b/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
index 732ef50721..448ccab023 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.android.desugar.proto.DesugarDeps.Dependency;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.DesugarDepsInfo;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceDetails;
 import com.google.devtools.build.android.desugar.proto.DesugarDeps.InterfaceWithCompanion;
-import com.google.devtools.build.android.desugar.proto.DesugarDeps.Type;
 import javax.annotation.Nullable;
 
 /** Dependency collector that emits collected metadata as a {@link DesugarDepsInfo} proto. */
@@ -82,7 +81,7 @@ public final class MetadataCollector implements DependencyCollector {
     return DesugarDepsInfo.getDefaultInstance().equals(result) ? null : result.toByteArray();
   }
 
-  private static Type wrapType(String internalName) {
-    return Type.newBuilder().setBinaryName(internalName).build();
+  private static DesugarDeps.Type wrapType(String internalName) {
+    return DesugarDeps.Type.newBuilder().setBinaryName(internalName).build();
   }
 }
\ No newline at end of file
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java
index 166066ea09..95683876aa 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/ZipIn.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
-import java.util.Map.Entry;
+import java.util.Map;
 
 /**
  * API for reading a zip file. This does not perform decompression of entry data, but provides
@@ -249,7 +249,7 @@ public class ZipIn {
    */
   public ZipEntry nextFrom(DirectoryEntry entry) throws IOException {
     int offset = entry == null ? -1 : entry.get(CENOFF);
-    Entry<Integer, DirectoryEntry> mapEntry = cdir.mapByOffset().higherEntry(offset);
+    Map.Entry<Integer, DirectoryEntry> mapEntry = cdir.mapByOffset().higherEntry(offset);
     if (mapEntry == null) {
       return entryWith(null);
     }