android 2.3: fixing plugin layout

build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy

@@ -65,7 +65,7 @@ abstract class BaseIdeaProperties extends ProductProperties {
     "tasks-core", "tasks-java",
     "maven", "gradle",
     "git4idea", "remote-servers-git", "remote-servers-git-java", "svn4idea", "hg4idea", "github", "cvs-plugin",
-    "jetgroovy", "junit", "testng", "xpath", "xslt-debugger", "android", "javaFX-CE",
+    "jetgroovy", "junit", "testng", "xpath", "xslt-debugger", "android-plugin", "javaFX-CE",
     "java-i18n", "ant", "ui-designer", "ByteCodeViewer", "coverage", "java-decompiler-plugin", "devkit", "eclipse",
     "IntelliLang", "IntelliLang-java", "IntelliLang-xml", "intellilang-jps-plugin"
   ]

platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy

@@ -238,8 +238,10 @@ class CommunityRepositoryModules {
   ]
 
   static PluginLayout androidPlugin(Map<String, String> additionalModulesToJars) {
-    plugin("android") {
-      withModule("android-plugin", "android.jar")
+    plugin("android-plugin") {
+      mainJarName = "android.jar"
+      directoryName = "android"
+      withModule("android", "android.jar")
       withModule("observable", "android.jar")
       withModule("wizard", "android.jar")
       withModule("sdk-updates", "android.jar")