Allow skia_win.cpp to be compiled in CONSOLE or GUI mode.

gyp/SampleApp.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.
 #
 {
+  'includes': [
+    'apptype_console.gypi',
+  ],
   'variables': {
     #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp
     'sample_pdf_file_viewer%': 0,
   },
   'targets': [
     {
       'target_name': 'SampleApp',
       'type': 'executable',
       'mac_bundle' : 1,
       'include_dirs' : [
@@ skipping 273 matching lines @@
           'dependencies': [
             'android_deps.gyp:Android_SampleApp',
           ],
         }],
         [ 'skia_gpu == 1', {
           'dependencies': [
             'gputest.gyp:skgputest',
           ],
         }],
       ],
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'SubSystem': '2',
-        },
-      },
     },
   ],
 }