Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto

Index: third_party/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
diff --git a/third_party/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto b/third_party/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
index b74484ce58dd956144a87d2fc25d6592fcd6058b..56351f168cb00a7d7f3bc5dce27c55d1a5b2610c 100644
--- a/third_party/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
+++ b/third_party/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
@@ -28,53 +28,20 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Proto to test proto3 Timestamp and Duration.
 syntax = "proto3";
 
-package google.protobuf.testing;
+package google.protobuf.testing.timestampduration;
+option java_package = "com.google.protobuf.testing.timestampduration";
 
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 
-message TimestampDurationTestCases {
-  // Timestamp tests
-  TimeStampType epoch = 1;
-  TimeStampType epoch2 = 2;
-  TimeStampType mintime = 3;
-  TimeStampType maxtime = 4;
-  TimeStampType timeval1 = 5;
-  TimeStampType timeval2 = 6;
-  TimeStampType timeval3 = 7;
-  TimeStampType timeval4 = 8;
-  TimeStampType timeval5 = 9;
-  TimeStampType timeval6 = 10;
-  TimeStampType timeval7 = 11;
-  google.protobuf.Timestamp timeval8 = 12;
-
-  // Duration tests
-  DurationType zero_duration = 101;
-  DurationType min_duration = 102;
-  DurationType max_duration = 103;
-  DurationType duration1 = 104;
-  DurationType duration2 = 105;
-  DurationType duration3 = 106;
-  DurationType duration4 = 107;
-  google.protobuf.Duration duration5 = 108;
-}
-
-message TimeStampType {
-  google.protobuf.Timestamp timestamp = 1;
-}
-
-message DurationType {
-  google.protobuf.Duration duration = 1;
-}
-
-service TimestampDurationTestService {
-  rpc Call(TimestampDurationTestCases) returns (TimestampDurationTestCases);
-}
-
 message TimestampDuration {
   google.protobuf.Timestamp ts = 1;
   google.protobuf.Duration dur = 2;
-  repeated google.protobuf.Timestamp rep_ts = 3;
+}
+
+service TestService {
+  rpc Call(TimestampDuration) returns (TimestampDuration);
 }