Rename VulkanViewer to Viewer, take 2.

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 31 matching lines @@
         'android_apk_suffix': "debug.apk",
       }, {
         # This also accounts for Release_Developer BUILDTYPE
         'android_buildtype': "Release", 
         'android_apk_suffix': "release.apk",
       }],
     ],
   },
   'includes' : [
       'canvasproof.gypi',
-      'vulkanviewer.gypi',
+      'viewer.gypi',
   ],
   'targets': [
     {
       'target_name': 'CopySampleAppDeps',
       'type': 'none',
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'SampleApp.gyp:SampleApp',
       ],
       'copies': [
@@ skipping 213 matching lines @@
             '<(android_base)/apps/gradlew',
             ':visualbenchsdl:assemble<(android_variant)<(android_buildtype)',
             '-p<(android_base)/apps/visualbenchsdl',
             '-PsuppressNativeBuild',
           ],
         },
       ],
     },
   ],
 }