Roll Protobuf r415:r423.

third_party/protobuf/protobuf.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.
 
 {
   'conditions': [
     ['OS!="win"', {
       'variables': {
         'config_h_dir':
           '.',  # crafted for gcc/linux.
@@ skipping 24 matching lines @@
     #   option optimize_for = LITE_RUNTIME;
     #
     # to your .proto file.
     {
       'target_name': 'protobuf_lite',
       'type': 'static_library',
       'toolsets': ['host', 'target'],
       'sources': [
         'src/google/protobuf/stubs/atomicops.h',
         'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',
+        'src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h',
+        'src/google/protobuf/stubs/atomicops_internals_macosx.h',
         'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h',
         'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
         'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h',
-        'src/google/protobuf/stubs/atomicops_internals_x86_macosx.h',
         'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
         'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',
         'src/google/protobuf/stubs/common.h',
         'src/google/protobuf/stubs/once.h',
         'src/google/protobuf/stubs/platform_macros.h',
         'src/google/protobuf/extension_set.h',
         'src/google/protobuf/generated_message_util.h',
         'src/google/protobuf/message_lite.h',
         'src/google/protobuf/repeated_field.h',
         'src/google/protobuf/unknown_field_set.cc',
@@ skipping 251 matching lines @@
   #     ],
   #     'dependencies': [
   #       'protoc#host',
   #     ],
   #     'sources': [
   #       'src/google/protobuf/descriptor.proto',
   #     ],
      },
   ],
 }