Merge remote-tracking branch 'origin/merge_v1' into merge_v1

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.2'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -77,13 +77,13 @@ android {
     buildTypes {
         debug {
             debuggable true
-            jniDebugBuild true
+            jniDebuggable true
         }
 
         if (doSigningForRelease) {
             release {
                 debuggable false
-                jniDebugBuild false
+                jniDebuggable false
                 signingConfig signingConfigs.release
             }
         }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip