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

gyp/utils.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 for utils.
 {
   'targets': [
     {
       'target_name': 'utils',
       'product_name': 'skia_utils',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'etc1.gyp:libetc1',
       ],
       'includes': [
         'utils.gypi',
       ],
       'include_dirs': [
         '../include/effects',
         '../include/images',
         '../include/pathops',
         '../include/pipe',
-        '../include/private',
         '../include/utils',
         '../include/utils/mac',
         '../include/utils/unix',
         '../include/utils/win',
         '../src/core',
         '../src/image',
         '../src/opts',
         '../src/utils',
       ],
       'sources': [
@@ skipping 101 matching lines @@
         '../src/utils/android/SkHwuiRenderer.cpp',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../src/utils/android',
         ],
       },
     },
   ],
 }