prepare skia for shared library build on android

gyp/bench.gyp

 # GYP file to build performance testbench.
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'bench',
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
         '../src/effects',
         '../src/utils',
       ],
       'includes': [
         'bench.gypi'
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
         'bench_timer',
       ],
       'conditions': [
         ['skia_gpu == 1',
           {
             'include_dirs' : [
               '../src/gpu',
             ],
           },
         ],
@@ skipping 10 matching lines @@
         '../bench/BenchSysTimer_posix.h',
         '../bench/BenchSysTimer_posix.cpp',
         '../bench/BenchSysTimer_windows.h',
         '../bench/BenchSysTimer_windows.cpp',
       ],
         'include_dirs': [
         '../src/core',
         '../src/gpu',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
+        'skia_lib.gyp:skia_lib',
       ],
       'conditions': [
         [ 'skia_os not in ["mac", "ios"]', {
           'sources!': [
             '../bench/BenchSysTimer_mach.h',
             '../bench/BenchSysTimer_mach.cpp',
           ],
         }],
         [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
           'sources!': [
@@ skipping 23 matching lines @@
       ],
     }
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: