upgrades latest gradle and build tools

* upgrades latest gradle and build tools

* restore part of the previous removed comment

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
     }
@@ -45,16 +45,11 @@ android {
         testHandleProfiling true
         testFunctionalTest true
     }
-
     // Without this parameter, all builds fail with error:
     //     Execution failed for task ':mergeArmeabiDebugResources'.
     //     > Some file crunching failed, see logs for details
     // https://code.google.com/p/android/issues/detail?id=163378
-    //
-    // NOTE: Setting this causes a crash when opening the DeviceFragment:
-    //       Resources$NotFoundException: File res/drawable/ic_tag_text_outline_black_24dp.xml
-    //       This means we can't use build tools 2.0 until this is fixed.
-    //aaptOptions.setProperty("cruncherEnabled", false)
+    aaptOptions.setProperty("cruncherEnabled", false)
 
     // We haven't upgraded to the new HTTP library yet.
     useLibrary 'org.apache.http.legacy'

gradle.properties

@@ -1 +1,2 @@
 android.useDeprecatedNdk=true
+org.gradle.jvmargs=-Xmx2048M

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
-#Sun Dec 07 11:37:19 EET 2014
+#Tue Jun 21 23:54:04 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
-distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionSha256Sum=65bbc0ef9c48be86fb06522fc927d59dcc7c04266f2bb8156be76971f7c3fc4a