Fix sample-create script

Remove some unneeded lines from create template's
Application/build.gradle directory. (The keywords changed with Android
Studio 1.0, but the file gets replaced by the base template after the
initial refresh task runs.)

Also upgraded the gradle wrapper used for the initial refresh.

Bug: 20055774
Change-Id: I12c4f530efa739ac71d9031bb8f53bc413c9a586
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index 2cf202f..9dda27c 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -37,11 +37,6 @@
           to always use the most current SDK as their target. -->
     compileSdkVersion ${compile_sdk}
     buildToolsVersion ${build_tools_version}
-
-    defaultConfig {
-        testPackageName "${sample.package}.test"
-        testInstrumentationRunner "android.test.InstrumentationTestRunner"
-    }
 }
 
 task preflight (dependsOn: parent.preflight) {
diff --git a/templates/create/gradle/wrapper/gradle-wrapper.properties b/templates/create/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..afb3296 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.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-bin.zip