Revert "Move headers used by headers in include/ to include/private."

gyp/tools.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.
     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
@@ skipping 251 matching lines @@
         '../tools/skhello.cpp',
       ],
     },
     {
       'target_name': 'skpinfo',
       'type': 'executable',
       'sources': [
         '../tools/skpinfo.cpp',
       ],
       'include_dirs': [
-        '../include/private',
         '../src/core/',
       ],
       'dependencies': [
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       # Superseded by dm, should be removed.
       'target_name': 'skp2svg',
@@ skipping 128 matching lines @@
     },
     {
       'target_name': 'dump_record',
       'type': 'executable',
       'sources': [
         '../tools/dump_record.cpp',
         '../tools/DumpRecord.cpp',
         '../tools/LazyDecodeBitmap.cpp',
       ],
       'include_dirs': [
-        '../include/private',
         '../src/core/',
         '../src/images',
         '../src/lazy',
       ],
       'dependencies': [
         'timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
@@ skipping 139 matching lines @@
       ],
       'dependencies': [
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'filter',
       'type': 'executable',
       'include_dirs' : [
-        '../include/private',
         '../src/core',
         '../src/utils/debugger',
       ],
       'sources': [
         '../tools/filtermain.cpp',
         '../src/utils/debugger/SkDrawCommand.h',
         '../src/utils/debugger/SkDrawCommand.cpp',
         '../src/utils/debugger/SkDebugCanvas.h',
         '../src/utils/debugger/SkDebugCanvas.cpp',
         '../src/utils/debugger/SkObjectParser.h',
@@ skipping 183 matching lines @@
               'flags.gyp:flags',
               'skia_lib.gyp:skia_lib',
               'resources',
             ],
           },
         ],
       },
     ],
   ],
 }