AI 145169: am: CL 145098 am: CL 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).
  Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145169
4 files changed