Automatic code cleanup. PiperOrigin-RevId: 562995425 Change-Id: I1c2a0b8bef1a39ce4661cc2bd4b47a3c3be27042

diff --git a/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java b/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
index c48463f..4565ebc 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AaptCommandBuilder.java

@@ -204,14 +204,6 @@
     AaptCommandBuilder thenAdd(String flag, @Nullable Path value);
 
     /**
-     * Adds a single flag and associated path value to the builder if the value is non-null and the
-     * condition was true.
-     *
-     * @see AaptCommandBuilder#add(String,Optional)
-     */
-    AaptCommandBuilder thenAdd(String flag, Optional<Path> value);
-
-    /**
      * Adds the values in the collection to the builder, each preceded by the given flag, if the
      * collection was non-empty and the condition was true.
      *
@@ -246,11 +238,6 @@
     }
 
     @Override
-    public AaptCommandBuilder thenAdd(String flag, @Nullable Optional<Path> value) {
-      return originalCommandBuilder.add(flag, value);
-    }
-
-    @Override
     public AaptCommandBuilder thenAddRepeated(String flag, Collection<String> values) {
       return originalCommandBuilder.addRepeated(flag, values);
     }
@@ -283,13 +270,6 @@
     }
 
     @Override
-    public AaptCommandBuilder thenAdd(String flag, Optional<Path> value) {
-      Preconditions.checkNotNull(flag);
-      Preconditions.checkNotNull(value);
-      return originalCommandBuilder;
-    }
-
-    @Override
     public AaptCommandBuilder thenAddRepeated(String flag, Collection<String> values) {
       Preconditions.checkNotNull(flag);
       Preconditions.checkNotNull(values);

diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidManifest.java b/src/tools/android/java/com/google/devtools/build/android/AndroidManifest.java
index 21a2db7..097446f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/AndroidManifest.java
+++ b/src/tools/android/java/com/google/devtools/build/android/AndroidManifest.java

@@ -92,10 +92,6 @@
         .filter(not(String::isEmpty));
   }
 
-  public static AndroidManifest asEmpty() {
-    return new AndroidManifest("", "1");
-  }
-
   public static AndroidManifest of(String packageName, String minSdk) {
     return new AndroidManifest(packageName, minSdk);
   }

diff --git a/src/tools/android/java/com/google/devtools/build/android/ExecutorServiceCloser.java b/src/tools/android/java/com/google/devtools/build/android/ExecutorServiceCloser.java
index 933a876..44b4161 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ExecutorServiceCloser.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ExecutorServiceCloser.java

@@ -55,20 +55,6 @@
     return new ExecutorServiceCloser(executorService);
   }
 
-  /**
-   * Creates a {@link ListeningExecutorService} with a sane sized thread pool based on our current
-   * metrics.
-   */
-  public static ListeningExecutorService createDefaultService() {
-    // The reported availableProcessors may be higher than the actual resources
-    // (on a shared system). On the other hand, a lot of the work is I/O, so it's not completely
-    // CPU bound. As a compromise, divide by 2 the reported availableProcessors.
-    int numThreads = Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
-    final ListeningExecutorService executorService =
-        MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(numThreads));
-    return executorService;
-  }
-
   // Delegate methods below
 
   @Override

diff --git a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
index 7b1a1d6..1f86dcd 100644
--- a/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java
+++ b/src/tools/android/java/com/google/devtools/build/android/FullyQualifiedName.java

@@ -352,11 +352,9 @@
     RESOURCES_ATTRIBUTE("<resources>", "Resources Attribute");
 
     private final String name;
-    private final String displayName;
 
     private VirtualType(String name, String displayName) {
       this.name = name;
-      this.displayName = displayName;
     }
 
     /** Returns the enum represented by the {@code name}. */
@@ -385,11 +383,6 @@
       return name;
     }
 
-    /** Returns a translated display name for the resource type. */
-    public String getDisplayName() {
-      return displayName;
-    }
-
     @Override
     public ConcreteType getType() {
       return ConcreteType.VIRTUAL_TYPE;
@@ -703,10 +696,6 @@
       return create(new ResourceTypeWrapper(type), name, pkg);
     }
 
-    public FullyQualifiedName create(ResourceType type, String name, String pkg) {
-      return create(new ResourceTypeWrapper(type), name, pkg);
-    }
-
     public FullyQualifiedName create(VirtualType type, String name) {
       return create(type, name, pkg);
     }

diff --git a/src/tools/android/java/com/google/devtools/build/android/InMemoryProfiler.java b/src/tools/android/java/com/google/devtools/build/android/InMemoryProfiler.java
index d7c49c7..1cc378f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/InMemoryProfiler.java
+++ b/src/tools/android/java/com/google/devtools/build/android/InMemoryProfiler.java

@@ -14,7 +14,6 @@
 
 package com.google.devtools.build.android;
 
-import static java.util.stream.Collectors.joining;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
@@ -54,10 +53,6 @@
     return this;
   }
 
-  public String asTimingReport() {
-    return report.stream().map(Timing::toString).collect(joining("\n"));
-  }
-
   static final class Timing {
 
     private final String taskName;