Update //third_party/protobuf to version 3.

third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto

Index: third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto b/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
similarity index 87%
copy from third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto
copy to third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
index d077563cbd84d7be6daddec3f553cb564f23da0a..b31c43994c9e8ac4142fa8490d5d9017f83c2b78 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import_public_lite.proto
+++ b/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
@@ -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,15 +28,14 @@
 // (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: liujisi@google.com (Pherl Liu)
-
+// Author: maxtroy@google.com (Max Cai)
 
 package protobuf_unittest_import;
 
-option optimize_for = LITE_RUNTIME;
-
 option java_package = "com.google.protobuf";
+option java_outer_classname = "MultipleNameClashNano";
+option java_multiple_files = true;
 
-message PublicImportMessageLite {
-  optional int32 e = 1;
+message MultipleNameClashNano {
+  optional int32 field = 1;
 }