Revert of try to speed-up maprect + round2i + contains

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 369 matching lines @@
       ],
     },
     {
       'target_name': 'picture_utils',
       'type': 'static_library',
       'sources': [
         '../tools/picture_utils.cpp',
         '../tools/picture_utils.h',
       ],
       'include_dirs': [
-          '../include/private',
           '../src/core/',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../tools/',
         ],
       },
@@ skipping 274 matching lines @@
               'pdf.gyp:pdf',
               'gputest.gyp:osmesa',
             ],
             'defines': [ 'FIDDLE_BUILD_TEST' ],
           },
         ],
       },
     ],
   ],
 }