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

third_party/protobuf/java/core/src/main/java/com/google/protobuf/NioByteString.java

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // 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
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 12 matching lines @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.InvalidMarkException;
 import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.List;
 
 /**
  * A {@link ByteString} that wraps around a {@link ByteBuffer}.
  */
 final class NioByteString extends ByteString.LeafByteString {
   private final ByteBuffer buffer;
 
   NioByteString(ByteBuffer buffer) {
-    checkNotNull(buffer, "buffer");
+    if (buffer == null) {
+      throw new NullPointerException("buffer");
+    }
 
-    // Use native byte order for fast fixed32/64 operations.
     this.buffer = buffer.slice().order(ByteOrder.nativeOrder());
   }
 
   // =================================================================
   // Serializable
 
   /**
    * Magic method that lets us override serialization behavior.
    */
   private Object writeReplace() {
@@ skipping 193 matching lines @@
 
         len = Math.min(len, buf.remaining());
         buf.get(bytes, off, len);
         return len;
       }
     };
   }
 
   @Override
   public CodedInputStream newCodedInput() {
-    return CodedInputStream.newInstance(buffer, true);
+    return CodedInputStream.newInstance(buffer);
   }
 
   /**
    * Creates a slice of a range of this buffer.
    *
    * @param beginIndex the beginning index of the slice (inclusive).
    * @param endIndex the end index of the slice (exclusive).
    * @return the requested slice.
    */
   private ByteBuffer slice(int beginIndex, int endIndex) {
     if (beginIndex < buffer.position() || endIndex > buffer.limit() || beginIndex > endIndex) {
       throw new IllegalArgumentException(
           String.format("Invalid indices [%d, %d]", beginIndex, endIndex));
     }
 
     ByteBuffer slice = buffer.slice();
     slice.position(beginIndex - buffer.position());
     slice.limit(endIndex - buffer.position());
     return slice;
   }
 }