Prepare skia for shared library build on android

This reapplies revision 9378 after the buildbot has been updated.

R=borenet@google.com, djsollen@google.com

Review URL: https://codereview.chromium.org/15855006

git-svn-id: http://skia.googlecode.com/svn/trunk@9395 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index b935fb0..9ea300d 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -94,17 +94,12 @@
         '../debugger/SkObjectParser.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'images.gyp:images',
-        'effects.gyp:effects',
+        'skia_lib.gyp:skia_lib',
         'bench.gyp:bench_timer',
         'tools.gyp:picture_renderer',
       ],
       'conditions': [
         [ 'skia_os == "nacl"', {
-          'dependencies': [
-            'utils.gyp:utils', # For SkBase64.h
-          ],
           'include_dirs': [
             '../src/utils',
           ],