Upgrade Android Gradle plugins

platform_tools/android/gyp/skia_android.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 {
@@ skipping 20 matching lines @@
         'android_variant%': "x86_64",
       }],
       [ 'skia_arch_type == "mips32"', {
         'android_arch%': "mips",
         'android_variant%': "mips",
       }],
       [ 'skia_arch_type == "mips64"', {
         'android_arch%': "mips64",
         'android_variant%': "mips64",
       }],
-      [ 'android_buildtype == "Release"', {
+      [ 'android_buildtype == "Debug"', {
+        'android_apk_suffix': "debug.apk",
+      }, {
+        # This also accounts for Release_Developer BUILDTYPE
+        'android_buildtype': "Release", 
         'android_apk_suffix': "release.apk",
-      }, {
-        'android_apk_suffix': "debug.apk",
       }],
     ],
   },
   'includes' : [
       'canvasproof.gypi',
       'vulkanviewer.gypi',
   ],
   'targets': [
     {
       'target_name': 'CopySampleAppDeps',
@@ skipping 219 matching lines @@
             '<(android_base)/apps/gradlew',
             ':visualbenchsdl:assemble<(android_variant)<(android_buildtype)',
             '-p<(android_base)/apps/visualbenchsdl',
             '-PsuppressNativeBuild',
           ],
         },
       ],
     },
   ],
 }