Move SkAndroidSDKCanvas to tools and ensure that it is built on all Android builds

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 590ac3b1755b7d2b5b1a7a37c3fc4e14465ae464..1e7eabbecf8810b7a451f7cb0ee6b1ab000ed5f2 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -42,7 +42,32 @@
             ],
           },
         ],
+        [ 'skia_os == "android"',
+          {
+            'dependencies': [
+               # Build this by default to catch compile errors more quickly, since
+               # the only other time this code is exercised in the android framework
+              'android_utils',
+            ],
+          },
+        ],
+      ],
+    },
+    {
+      'target_name': 'android_utils',
+      'type': 'static_library',
+      'dependencies': [
+        'core.gyp:core',
+      ],
+      'sources': [
+        '../tools/android/SkAndroidSDKCanvas.h',
+        '../tools/android/SkAndroidSDKCanvas.cpp',
       ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../tools/android',
+        ],
+      },
     },
     {
         'target_name': 'dump_record',