Merge branch 'master' into 4.0.x (gradle fixes)

framework/build.gradle

@@ -25,7 +25,12 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.+'
+        // This should be updated with each cordova-android release.
+        // It can affect things like where the .apk is generated.
+        // It also dictates what the minimum android build-tools version
+        // that you need (Set in bin/templates/project/cordova.gradle).
+        // Be sure to also update the value in bin/templates/project.
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }