Update Android Testing apps to support release mode

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_apk_suffix': "release-unsigned.apk",
+      }, {
+        'android_apk_suffix': "debug.apk",
+      }],
     ],
   },
   'targets': [
     {
       'target_name': 'CopySampleAppDeps',
       'type': 'none',
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'SampleApp.gyp:SampleApp',
       ],
@@ skipping 38 matching lines @@
             '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libSampleApp.so',
           ],
           'conditions': [
             [ 'skia_shared_lib', {
               'inputs': [
                 '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libskia_android.so',
               ],
             }],
           ],
           'outputs': [
-            '<(android_base)/apps/sample_app/build/outputs/apk/sample_app-arm-debug.apk',
+            '<(android_base)/apps/sample_app/build/outputs/apk/sample_app-<(android_variant)-<(android_apk_suffix)',
           ],
           'action': [
             '<(android_base)/apps/gradlew',
-            ':sample_app:assemble<(android_variant)Debug',
+            ':sample_app:assemble<(android_variant)<(android_buildtype)',
             '-p<(android_base)/apps/sample_app',
             '-PsuppressNativeBuild',
           ],
         },
       ],
     },
     {
       'target_name': 'CopyVisualBenchDeps',
       'type': 'none',
       'dependencies': [
@@ skipping 38 matching lines @@
             '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libvisualbench.so',
           ],
           'conditions': [
             [ 'skia_shared_lib', {
               'inputs': [
                 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libskia_android.so',
               ],
             }],
           ],
           'outputs': [
-            '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-arm-debug.apk',
+            '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(android_variant)-<(android_apk_suffix)',
           ],
           'action': [
             '<(android_base)/apps/gradlew',
-            ':visualbench:assemble<(android_variant)Debug',
+            ':visualbench:assemble<(android_variant)<(android_buildtype)',
             '-p<(android_base)/apps/visualbench',
             '-PsuppressNativeBuild',
           ],
         },
       ],
     },
   ],
 }