Upgrade Android Gradle plugins

platform_tools/android/apps/build.gradle

Index: platform_tools/android/apps/build.gradle
diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle
index b20334b887694d3bb8652ae46ae61debc35dc1f9..7622cbdca3560c86573144dd83e5640aa778936c 100644
--- a/platform_tools/android/apps/build.gradle
+++ b/platform_tools/android/apps/build.gradle
@@ -1,11 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +19,24 @@ allprojects {
     }
 }
 
+def setupSkiaLibraryBuild(project, appVariants, buildCmd) {
+    appVariants.all{ variant ->
+        def buildNativeLib = project.task("${variant.name}_SkiaNativeLib", type:Exec) {
+            workingDir '../../../..' // top-level skia directory
+            commandLine constructBuildCommand(variant, buildCmd).split()
+            environment PATH: getPathWithDepotTools()
+            environment ANDROID_SDK_ROOT: getSDKPath()
+        }
+        buildNativeLib.onlyIf { !project.hasProperty("suppressNativeBuild") }
+        TaskCollection<Task> compileTask = project.tasks.matching {
+            //  println(it.name)
+            it.name.toLowerCase().contains("compile" + variant.name.toLowerCase()) &&
+                    it.name.toLowerCase().endsWith("ndk")
+        }
+        compileTask.getAt(0).dependsOn buildNativeLib
+    }
+}
+
 def getLocalProperties() {
     Properties properties = new Properties()
     File propFile = project.rootProject.file('local.properties')