Remove internal options from proto files.

Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9

java/util/src/test/java/com/google/protobuf/util/json_test.proto

@@ -65,7 +65,7 @@ message TestAllTypes {
   float optional_float = 11;
   double optional_double = 12;
   bool optional_bool = 13;
-  string optional_string = 14 [enforce_utf8 = false];
+  string optional_string = 14;
   bytes optional_bytes = 15;
   NestedMessage optional_nested_message = 18;
   NestedEnum optional_nested_enum = 21;
@@ -84,7 +84,7 @@ message TestAllTypes {
   repeated float repeated_float = 41;
   repeated double repeated_double = 42;
   repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44 [enforce_utf8 = false];
+  repeated string repeated_string = 44;
   repeated bytes repeated_bytes = 45;
   repeated NestedMessage repeated_nested_message = 48;
   repeated NestedEnum repeated_nested_enum = 51;
@@ -112,7 +112,7 @@ message TestMap {
   map<sfixed32, int32> sfixed32_to_int32_map = 9;
   map<sfixed64, int32> sfixed64_to_int32_map = 10;
   map<bool, int32> bool_to_int32_map = 11;
-  map<string, int32> string_to_int32_map = 12 [enforce_utf8 = false];
+  map<string, int32> string_to_int32_map = 12;
 
   map<int32, int64> int32_to_int64_map = 101;
   map<int32, uint32> int32_to_uint32_map = 102;
@@ -126,7 +126,7 @@ message TestMap {
   map<int32, float> int32_to_float_map = 110;
   map<int32, double> int32_to_double_map = 111;
   map<int32, bool> int32_to_bool_map = 112;
-  map<int32, string> int32_to_string_map = 113 [enforce_utf8 = false];
+  map<int32, string> int32_to_string_map = 113;
   map<int32, bytes> int32_to_bytes_map = 114;
   map<int32, TestAllTypes.NestedMessage> int32_to_message_map = 115;
   map<int32, TestAllTypes.NestedEnum> int32_to_enum_map = 116;