Move VisualBench_APK and SampleApp_APK to "everything" target

gyp/most.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Build ALMOST everything provided by Skia; this should be the default target.
 #
 # This omits the following targets that many developers won't want to build:
 # - debugger: this requires QT to build
 #
 {
@@ skipping 31 matching lines @@
         [ 'skia_os != "android" and skia_os != "linux"', {
           'dependencies!': [
             'kilobench.gyp:kilobench',
           ],
         }],
         [ 'skia_gpu == 0 or skia_os == "android"', {
           'dependencies!': [
             'example.gyp:HelloWorld',
           ],
         }],
-        ['skia_os == "android"', {
+        ['skia_os == "android" and skia_vulkan == 1', {
           'dependencies': [
-            'android_system.gyp:SampleApp_APK',
-          ],
-          'conditions': [
-            [ 'skia_gpu == 1', {
-              'dependencies': [
-                'android_system.gyp:VisualBench_APK',
-              ],
-            }],
-            [ 'skia_vulkan == 1', {
-              'dependencies': [
-                'android_system.gyp:Viewer_APK',
-              ],
-            }],
+            'android_system.gyp:Viewer_APK',
           ],
         }],
         ['skia_os == "ios"', {
           'dependencies!': [
             'example.gyp:HelloWorld',
             'SampleApp.gyp:SampleApp',
             'visualbench.gyp:visualbench',
           ],
           'dependencies': ['iOSShell.gyp:iOSShell' ],
         }],
@@ skipping 18 matching lines @@
               'example.gyp:HelloWorld',
               'SampleApp.gyp:SampleApp',
               'visualbench.gyp:visualbench',
             ]
           }
         ],
       ],
     },
   ],
 }