Merge pull request #114 from allight/master

Replace jadx-core/lib/dx-1.10.jar with recent AOSP dx.jar

.travis.yml

@@ -2,7 +2,6 @@ language: java
 jdk:
     - oraclejdk8
     - oraclejdk7
-    - openjdk6
 
 before_install:
     - chmod +x gradlew

jadx-core/build.gradle

@@ -3,7 +3,7 @@ ext.jadxClasspath = 'clsp-data/android-5.1.jar'
 dependencies {
     runtime files(jadxClasspath)
 
-    compile files('lib/dx-1.10.jar')
+    compile files('lib/dx.jar')
     compile 'commons-io:commons-io:2.4'
     compile 'org.ow2.asm:asm:5.0.3'
     compile 'com.intellij:annotations:12.0'