Update //third_party/protobuf to version 3.

third_party/protobuf/java/src/main/java/com/google/protobuf/ProtocolStringList.java

Index: third_party/protobuf/java/src/main/java/com/google/protobuf/ProtocolStringList.java
diff --git a/third_party/protobuf/python/google/protobuf/internal/more_messages.proto b/third_party/protobuf/java/src/main/java/com/google/protobuf/ProtocolStringList.java
similarity index 69%
copy from third_party/protobuf/python/google/protobuf/internal/more_messages.proto
copy to third_party/protobuf/java/src/main/java/com/google/protobuf/ProtocolStringList.java
index c701b4460b761a7f9db44e1159a1aadf7206a64a..d553b41e52bccc28a327950d20b2af98290d3273 100644
--- a/third_party/protobuf/python/google/protobuf/internal/more_messages.proto
+++ b/third_party/protobuf/java/src/main/java/com/google/protobuf/ProtocolStringList.java
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -28,24 +28,21 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Author: robinson@google.com (Will Robinson)
+package com.google.protobuf;
 
+import java.util.List;
 
-package google.protobuf.internal;
+/**
+ * An interface extending {@code List<String>} used for repeated string fields
+ * to provide optional access to the data as a list of ByteStrings. The
+ * underlying implementation stores values as either ByteStrings or Strings
+ * (see {@link LazyStringArrayList}) depending on how the value was initialized
+ * or last read, and it is often more efficient to deal with lists of
+ * ByteStrings when handling protos that have been deserialized from bytes.
+ */
+public interface ProtocolStringList extends List<String> {
 
-// A message where tag numbers are listed out of order, to allow us to test our
-// canonicalization of serialized output, which should always be in tag order.
-// We also mix in some extensions for extra fun.
-message OutOfOrderFields {
-  optional   sint32 optional_sint32   =  5;
-  extensions 4 to 4;
-  optional   uint32 optional_uint32   =  3;
-  extensions 2 to 2;
-  optional    int32 optional_int32    =  1;
-};
+  /** Returns a view of the data as a list of ByteStrings. */
+  List<ByteString> asByteStringList();
 
-
-extend OutOfOrderFields {
-  optional   uint64 optional_uint64   =  4;
-  optional    int64 optional_int64    =  2;
 }