Merge cherrypicks of [12986203, 12985811] into studio-4.1-release

Change-Id: Ifb080600875de885756aa9d950986a95e6f7ff35

build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy

diff --git a/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy b/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
index 20dea5d..88ffbd633 100644
--- a/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
@@ -139,7 +139,7 @@
       withCustomVersion({pluginXmlFile, ideVersion ->
         def text = pluginXmlFile.text
         def declaredVersion = text.substring(text.indexOf("<version>") + "<version>".length(), text.indexOf("</version>"))
-        return "$declaredVersion.$ideVersion"
+        return "$declaredVersion"
       })
       withModule("intellij.android.common", "android-common.jar", false)
       withModule("intellij.android.buildCommon", "build-common.jar", false)