Move SkBitmapRegionDecoder to include/android and src/android

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 969ea8745332723e628fc514d3c83f145bdfc4c9..8218a337504811a53f601552c568484c8a880675 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -17,7 +17,6 @@
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
-        'bitmap_region_decoder',
         'chrome_fuzz',
         'filter',
         'gpuveto',
@@ -48,27 +47,6 @@
       ],
     },
     {
-      'target_name': 'bitmap_region_decoder',
-      'type': 'static_library',
-      'sources': [
-        '../tools/android/SkBitmapRegionCanvas.cpp',
-        '../tools/android/SkBitmapRegionCodec.cpp',
-        '../tools/android/SkBitmapRegionDecoder.cpp',
-      ],
-      'include_dirs': [
-        '../include/private',
-        '../src/codec',
-      ],
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../tools/android',
-        ],
-      },
-    },
-    {
       'target_name': 'chrome_fuzz',
       'type': 'executable',
       'sources': [
@@ -587,6 +565,7 @@
       'cflags!': [ '-Wno-unused-parameter' ],
       'variables': {
         'includes_to_test': [
+          '<(skia_include_path)/android',
           '<(skia_include_path)/animator',
           '<(skia_include_path)/c',
           '<(skia_include_path)/codec',