Added tools to android components

Author: Zachary Sweigart

build.gradle

@@ -36,7 +36,7 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '4.5.1'
+  gradleVersion = '4.6'
   distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 

sample/build.gradle

@@ -14,47 +14,23 @@
  * limitations under the License.
  */
 
-buildscript {
-  dependencies {
-    classpath deps.build.gradlePlugins.android
-  }
+plugins {
+    id 'com.android.application'
 }
 
-apply plugin: 'com.android.application'
-
 android {
-  compileSdkVersion deps.build.compileSdkVersion
-  buildToolsVersion deps.build.buildToolsVersion
-
-  defaultConfig {
-    applicationId "com.uber.myapplication"
-    minSdkVersion deps.build.minSdkVersion
-    targetSdkVersion deps.build.targetSdkVersion
-    versionCode 1
-    versionName "1.0"
-  }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_7
-    targetCompatibility JavaVersion.VERSION_1_7
-  }
-
-  // Setup a simple lint config for an android app/library.
-  lintOptions {
-    abortOnError true
-    lintConfig rootProject.file('config/lint/lint.xml')
-    disable 'InvalidPackage'
-  }
-}
-
-// This is required to run checkstyle on an android app/library.
-task checkstyle(type: Checkstyle) {
-  source 'src'
-  include '**/*.java'
-  exclude '**/gen/**'
-
-  classpath = files()
+    compileSdkVersion deps.build.compileSdkVersion
+    buildToolsVersion deps.build.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion deps.build.minSdkVersion
+        targetSdkVersion deps.build.targetSdkVersion
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
-check.dependsOn 'checkstyle'
 
 
 dependencies {