Cleanup android build files and tools

gyp/visualbench.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.
 # GYP file to build visual bench tool
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
@@ skipping 46 matching lines @@
          'link_settings': {
             'libraries': [
               '-landroid',
               '-lGLESv2',
               '-lEGL',
             ],
           },
         }],
         [ 'skia_os == "android" and skia_use_sdl == 1', {
           'dependencies': [
-            'android_deps.gyp:Android_VisualBenchSDL',
+            'android_deps.gyp:Android_EntryPoint',
           ],
         }],
       ],
     },
   ],
 }