Revert of Remove Android SampleApp

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 21 matching lines @@
         [ 'skia_gpu == 0', {
           'dependencies!': [
             'viewer.gyp:viewer',
           ]
         }],
         [ '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:Viewer_APK',
           ],
-          'dependencies!': [
-            'SampleApp.gyp:SampleApp',
-          ],
         }],
         ['skia_os == "ios"', {
           'dependencies!': [
             'example.gyp:HelloWorld',
             'SampleApp.gyp:SampleApp',
           ],
           'dependencies': ['iOSShell.gyp:iOSShell' ],
         }],
         ['skia_os == "mac" or skia_os == "linux"', {
           'dependencies': [ 
@@ skipping 15 matching lines @@
             'dependencies!': [
               'example.gyp:HelloWorld',
               'SampleApp.gyp:SampleApp',
             ]
           }
         ],
       ],
     },
   ],
 }