cherry-picked fd064c4a176ade160a49965254ce8e69ff826da5 and fixed a conflict

Change-Id: I71968a3d6c8ea979735780e3d538a8b90be05522
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ba5f04a..da90a41 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -15,4 +15,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 86365e3..236aedd 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -19,7 +19,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
 
@@ -28,12 +28,12 @@
 dependencies {
     // Add the support lib that is appropriate for SDK ${sample.minSdk}
 <#if sample.minSdk?number < 7>
-    compile "com.android.support:support-v4:18.0.+"
+    compile "com.android.support:support-v4:19.0.+"
 <#elseif sample.minSdk?number < 13>
-    compile "com.android.support:support-v4:18.0.+"
-    compile "com.android.support:gridlayout-v7:18.0.+"
+    compile "com.android.support:support-v4:19.0.+"
+    compile "com.android.support:gridlayout-v7:19.0.+"
 <#else>
-    compile "com.android.support:support-v13:18.0.+"
+    compile "com.android.support:support-v13:19.0.+"
 </#if>
 <#list sample.dependency as dep>
     compile "${dep}"
@@ -52,7 +52,7 @@
      <#-- Note that target SDK is hardcoded in this template. We expect all samples
           to always use the most current SDK as their target. -->
     compileSdkVersion ${compile_sdk}
-    buildToolsVersion "19"
+    buildToolsVersion "19.0.1"
 
     sourceSets {
         main {
diff --git a/templates/create/gradle/wrapper/gradle-wrapper.properties b/templates/create/gradle/wrapper/gradle-wrapper.properties
index 861eddc..56f685a 100644
--- a/templates/create/gradle/wrapper/gradle-wrapper.properties
+++ b/templates/create/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 59f6410..0cc5add 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -44,4 +44,4 @@
 
 
 <#-- Set the global build tools version -->
-<#assign build_tools_version='"18.1"'/>
+<#assign build_tools_version='"19.0.1"'/>