Configuration: Use 'plugins' block in generated/modified Gradle scripts

#KT-20665 Fixed

idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.kt

@@ -32,17 +32,20 @@ class KotlinAndroidGradleModuleConfigurator internal constructor() : KotlinWithG
 
     override val kotlinPluginName: String = KOTLIN_ANDROID
 
+    override fun getKotlinPluginExpression(forKotlinDsl: Boolean): String =
+        if (forKotlinDsl) "kotlin(\"android\")" else "id 'org.jetbrains.kotlin.android' "
+
     override fun addElementsToFile(file: PsiFile, isTopLevelProjectFile: Boolean, version: String): Boolean {
-        val manipulator = getManipulator(file)
+        val manipulator = getManipulator(file, false)
         val sdk = ModuleUtil.findModuleForPsiElement(file)?.let { ModuleRootManager.getInstance(it).sdk }
         val jvmTarget = getJvmTarget(sdk, version)
-
         return if (isTopLevelProjectFile) {
-            manipulator.configureProjectBuildScript(version)
+            manipulator.configureProjectBuildScript(kotlinPluginName, version)
         }
         else {
             manipulator.configureModuleBuildScript(
                     kotlinPluginName,
+                    getKotlinPluginExpression(file.isKtDsl()),
                     getStdlibArtifactName(sdk, version),
                     version,
                     jvmTarget