Switch all usages of dx.jar to the new mechanism, cleanup and refactoring

compiler/build.gradle.kts

@@ -6,6 +6,10 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+repositories {
+    androidDxJarRepo(project)
+}
+
 configureIntellijPlugin {
     setExtraDependencies("intellij-core")
 }
@@ -62,7 +66,7 @@ dependencies {
 
     testRuntime(projectDist(":kotlin-reflect"))
     testRuntime(projectDist(":kotlin-daemon-client"))
-    testRuntime(project(":custom-dependencies:android-sdk", configuration = "dxJar"))
+    testRuntime(androidDxJar())
     testRuntime(files(toolsJar()))
 
     testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))

compiler/tests-common/build.gradle.kts

@@ -6,9 +6,7 @@ configureIntellijPlugin {
 }
 
 repositories {
-    ivy {
-        artifactPattern("${rootDir.absoluteFile.toURI().toURL()}/buildSrc/prepare-deps/dx/build/[artifact](-[classifier]).jar")
-    }
+    androidDxJarRepo(project)
 }
 
 dependencies {
@@ -35,7 +33,7 @@ dependencies {
     testCompile(projectTests(":compiler:tests-common-jvm6"))
     testCompileOnly(project(":kotlin-reflect-api"))
     testCompile(commonDep("junit:junit"))
-    testCompile("my-custom-deps:dx:0")
+    testCompile(androidDxJar())
 }
 
 afterEvaluate {