Revert "Gradle classes were moved"

This reverts commit 493911145eab684c6dfe4c1a9d555ff7cf4e20e1.

idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.kt

diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.kt
index f070bdb..de14c9c 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.kt
@@ -16,18 +16,20 @@
 
 package org.jetbrains.kotlin.android
 
-import com.android.ide.common.blame.output.GradleMessage
-import com.android.ide.common.blame.parser.PatternAwareOutputParser
-import com.android.ide.common.blame.parser.util.OutputLineReader
-import com.android.utils.ILogger
+import com.android.tools.idea.gradle.output.GradleMessage
+import com.android.tools.idea.gradle.output.parser.OutputLineReader
+import com.android.tools.idea.gradle.output.parser.ParsingFailedException
+import com.android.tools.idea.gradle.output.parser.PatternAwareOutputParser
 import com.intellij.openapi.util.io.FileUtilRt
 import com.intellij.openapi.util.text.StringUtil
+
 import java.io.File
+import java.util.regex.Matcher
 import java.util.regex.Pattern
 
 public class KotlinOutputParser : PatternAwareOutputParser {
 
-    override fun parse(line: String, reader: OutputLineReader, messages: MutableList<GradleMessage>, logger: ILogger): Boolean {
+    override fun parse(line: String, reader: OutputLineReader, messages: MutableList<GradleMessage>): Boolean {
         val colonIndex1 = line.colon()
         val severity = if (colonIndex1 >= 0) line.substringBeforeAndTrim(colonIndex1).parseSeverity() else null
         if (severity == null) return false