Update protobuf to r428, part 1.

third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto

Index: third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
===================================================================
--- third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto	(revision 216642)
+++ third_party/protobuf/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto	(working copy)
@@ -46,6 +46,23 @@
 message TestMessage {
 }
 
+message Descriptor {
+  option no_standard_descriptor_accessor = true;
+  optional string descriptor = 1;
+  message NestedDescriptor {
+    option no_standard_descriptor_accessor = true;
+    optional string descriptor = 1;
+  }
+  optional NestedDescriptor nested_descriptor = 2;
+}
+
+message Parser {
+  enum ParserEnum {
+    PARSER = 1;
+  }
+  optional ParserEnum parser = 1;
+}
+
 message Deprecated {
   enum TestEnum {
     FOO = 1;
@@ -62,6 +79,7 @@
 
 message Object {
   optional int32 object = 1;
+  optional string string_object = 2;
 }
 
 message String {