Move VisualBench_APK and SampleApp_APK to "everything" target

gyp/most.gyp

Index: gyp/most.gyp
diff --git a/gyp/most.gyp b/gyp/most.gyp
index 6d56f8819b346d66dc9b621070743ef3ad7b2b6c..9e54732a25915f1ebe2dee6781c50df8a71c20cb 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -49,21 +49,9 @@
             '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"', {