Merge change 20889 into donut

* changes:
  Properly update the new path of the AVD during an 'android avd move'

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java

@@ -911,7 +911,7 @@ public final class AvdManager {
                 replaceAvd(avdInfo, info);
 
                 // update the ini file
-                createAvdIniFile(avdInfo);
+                createAvdIniFile(info);
             }
 
             if (newName != null) {