Merge fixes.

Author: prbprbprb

common/src/test/java/org/conscrypt/javax/net/ssl/SSLEngineTest.java

@@ -1255,7 +1255,7 @@ private void wrapThenUnwrap(int bufferSize, ByteBuffer[] dest, int offset, int l
     }
 
     @Test
-    public void bufferArrayOffsets() throws Exception{
+    public void bufferArrayOffsets() throws Exception {
         TestSSLEnginePair pair = TestSSLEnginePair.create();
         ByteBuffer tlsBuffer = ByteBuffer.allocate(600);
         int bufferSize = 100;

testing/src/main/java/org/conscrypt/TestUtils.java

@@ -142,14 +142,6 @@ public ByteBuffer newRandomBuffer(int size) {
             buffer.flip();
             return buffer;
         }
-
-        public ByteBuffer[] newBufferArray(int arrayLength, int bufferSize) {
-            ByteBuffer[] result = new ByteBuffer[arrayLength];
-            for (int i = 0; i < arrayLength; i++) {
-                result[i] = newBuffer(bufferSize);
-            }
-            return result;
-        }
     }
 
     private TestUtils() {}