Protobuf: Remove protobuf globals patch

third_party/protobuf/src/google/protobuf/arena.h

Index: third_party/protobuf/src/google/protobuf/arena.h
diff --git a/third_party/protobuf/src/google/protobuf/arena.h b/third_party/protobuf/src/google/protobuf/arena.h
index 2836a6183048c25a74de9806aeedc5e18db1d8d0..cf07b9fc97c0cf4b7f7f4dba9caa5a9edc963833 100644
--- a/third_party/protobuf/src/google/protobuf/arena.h
+++ b/third_party/protobuf/src/google/protobuf/arena.h
@@ -70,9 +70,6 @@ class LazyField;   // lazy_field.h
 template<typename Type>
 class GenericTypeHandler; // repeated_field.h
 
-LIBPROTOBUF_EXPORT extern google::protobuf::internal::SequenceNumber
-    cr_lifecycle_id_generator_;
-
 // Templated cleanup methods.
 template<typename T> void arena_destruct_object(void* object) {
   reinterpret_cast<T*>(object)->~T();
@@ -555,20 +552,19 @@ class LIBPROTOBUF_EXPORT Arena {
   };
 
   static const size_t kHeaderSize = sizeof(Block);
+  static google::protobuf::internal::SequenceNumber lifecycle_id_generator_;
 #if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
   // Android ndk does not support GOOGLE_THREAD_LOCAL keyword so we use a custom thread
   // local storage class we implemented.
   // iOS also does not support the GOOGLE_THREAD_LOCAL keyword.
-  static ThreadCache& cr_thread_cache();
+  static ThreadCache& thread_cache();
 #elif defined(PROTOBUF_USE_DLLS)
   // Thread local variables cannot be exposed through DLL interface but we can
   // wrap them in static functions.
-  static ThreadCache& cr_thread_cache();
+  static ThreadCache& thread_cache();
 #else
   static GOOGLE_THREAD_LOCAL ThreadCache thread_cache_;
-  static ThreadCache& cr_thread_cache() {
-    return thread_cache_;
-  }
+  static ThreadCache& thread_cache() { return thread_cache_; }
 #endif
 
   // SFINAE for skipping addition to delete list for a message type when created
@@ -876,8 +872,8 @@ class LIBPROTOBUF_EXPORT Arena {
   uint64 ResetInternal();
 
   inline void SetThreadCacheBlock(Block* block) {
-    cr_thread_cache().last_block_used_ = block;
-    cr_thread_cache().last_lifecycle_id_seen = lifecycle_id_;
+    thread_cache().last_block_used_ = block;
+    thread_cache().last_lifecycle_id_seen = lifecycle_id_;
   }
 
   int64 lifecycle_id_;  // Unique for each arena. Changes on Reset().