Back out "Include Android SDK in D8 desugaring"

Reviewed By: ndmitchell

fbshipit-source-id: 589ed14cf0e58df8bf6bd8c7fecb5ec433f22436

Author: IanChilds

src/com/facebook/buck/android/D8Step.java

@@ -177,17 +177,14 @@ private int executeInProcess(IsolatedExecutionContext context) throws IOExceptio
       minSdkVersion.ifPresent(builder::setMinApiLevel);
       primaryDexClassNamesPath.ifPresent(builder::addMainDexListFiles);
 
-      ImmutableSet.Builder<Path> absolutePaths = ImmutableSet.builder();
-      // Always include the Android SDK on the classpath to support JARs/AARs compiled for Android
-      absolutePaths.add(androidPlatformTarget.getAndroidJar());
       if (classpathFiles != null && !classpathFiles.isEmpty()) {
-        // classpathFiles is needed only for D8 Java 8 desugar
+        // classpathFiles is needed only for D8 java 8 desugar
+        ImmutableSet.Builder<Path> absolutePaths = ImmutableSet.builder();
         for (Path classpathFile : classpathFiles) {
           absolutePaths.add(filesystem.getPathForRelativeExistingPath(classpathFile));
         }
+        builder.addClasspathFiles(absolutePaths.build());
       }
-      builder.addClasspathFiles(absolutePaths.build());
-
       D8Command d8Command = builder.build();
       com.android.tools.r8.D8.run(d8Command);