SDK Updater: Better guess for the addon folder name.

- Always unzip the archives first and get their root zip dir.
- Try to reusing an existing addon folder first.
- Or the root zip dir.
- Or come up with a better name for the addon folder.

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/LocalSdkAdapter.java

@@ -101,7 +101,8 @@ class LocalSdkAdapter  {
 
                 if (packages == null) {
                     // load on demand the first time
-                    packages = parser.parseSdk(mUpdaterData.getOsSdkRoot());
+                    packages = parser.parseSdk(mUpdaterData.getOsSdkRoot(),
+                            mUpdaterData.getSdkManager());
                 }
 
                 if (packages != null) {

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java

@@ -273,7 +273,7 @@ class UpdaterData {
                             break;
                         }
 
-                        if (archive.install(mOsSdkRoot, forceHttp, monitor)) {
+                        if (archive.install(mOsSdkRoot, forceHttp, mSdkManager, monitor)) {
                             numInstalled++;
                         }