Version 1.5.2

dart/editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/jobs/InstallUpdateAction.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 274 matching lines @@
     UpdateUtils.unzip(
         updateZip,
         tmpDir,
         UpdateJobMessages.InstallUpdateAction_extract_task,
         mon.newChild(20));
 
     monitor.setTaskName(UpdateJobMessages.InstallUpdateAction_preparing_task);
     File sdkDir = new File(installTarget, "dart-sdk"); //$NON-NLS-1$
     UpdateUtils.deleteDirectory(sdkDir, mon.newChild(4));
     UpdateUtils.deleteDirectory(new File(installTarget, "samples"), mon.newChild(4)); //$NON-NLS-1$
-
+    // TODO(keertip): check can be removed after all installs are on version with android dir
+    File androidDir = new File(installTarget, "android");
+    if (androidDir.exists()) {
+      UpdateUtils.deleteDirectory(androidDir, mon.newChild(4));
+    }
     terminateRunningDartLaunches();
 
     File dartium = DartSdkManager.getManager().getSdk().getDartiumWorkingDirectory(installTarget);
     try {
       UpdateUtils.delete(dartium, mon.newChild(2));
     } catch (Throwable th) {
       //TODO(pquitslund): handle delete errors
       UpdateCore.logError(th);
     }
 
@@ skipping 150 matching lines @@
   private void terminateRunningDartLaunches() {
     ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
     for (ILaunch launch : launchManager.getLaunches()) {
       if (!launch.isTerminated() && isDartLaunch(launch) && launch.canTerminate()) {
         terminate(launch);
       }
     }
   }
 
 }