Update from https://crrev.com/311076

cc/cc.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 106 matching lines @@
         'debug/micro_benchmark.cc',
         'debug/micro_benchmark.h',
         'debug/micro_benchmark_impl.cc',
         'debug/micro_benchmark_impl.h',
         'debug/micro_benchmark_controller.cc',
         'debug/micro_benchmark_controller.h',
         'debug/micro_benchmark_controller_impl.cc',
         'debug/micro_benchmark_controller_impl.h',
         'debug/paint_time_counter.cc',
         'debug/paint_time_counter.h',
+        'debug/picture_debug_util.cc',
+        'debug/picture_debug_util.h',
         'debug/picture_record_benchmark.cc',
         'debug/picture_record_benchmark.h',
         'debug/rasterize_and_record_benchmark.cc',
         'debug/rasterize_and_record_benchmark.h',
         'debug/rasterize_and_record_benchmark_impl.cc',
         'debug/rasterize_and_record_benchmark_impl.h',
         'debug/rendering_stats.cc',
         'debug/rendering_stats.h',
         'debug/rendering_stats_instrumentation.cc',
         'debug/rendering_stats_instrumentation.h',
@@ skipping 453 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }