AI 144938: Fix the classpath container cache for project targeting add-ons (bug #1775936).

Also renamed the container for add-ons to include the base platform name (so that at least a version is displayed).
  BUG=1775936

Automated import of CL 144938

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java

@@ -124,6 +124,10 @@ final class AddOnTarget implements IAndroidTarget {
         return String.format("%1$s (%2$s)", mName, mVendor);
     }
     
+    public String getClasspathName() {
+        return String.format("%1$s [%2$s]", mName, mBasePlatform.getName());
+    }
+
     public String getDescription() {
         return mDescription;
     }

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java

@@ -96,6 +96,11 @@ public interface IAndroidTarget extends Comparable<IAndroidTarget> {
      */
     String getFullName();
     
+    /**
+     * Returns the name to be displayed when representing all the libraries this target contains.
+     */
+    String getClasspathName();
+    
     /**
      * Returns the description of the target.
      */

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java

@@ -104,6 +104,10 @@ final class PlatformTarget implements IAndroidTarget {
     public String getFullName() {
         return mName;
     }
+    
+    public String getClasspathName() {
+        return mName;
+    }
 
     /*
      * (non-Javadoc)