Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java

Index: webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java
diff --git a/webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java b/webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java
deleted file mode 100644
index 47b46414b759560fc90052c10b74a7e3407d1e81..0000000000000000000000000000000000000000
--- a/webrtc/api/java/src/org/webrtc/CallSessionFileRotatingLogSink.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc;
-
-public class CallSessionFileRotatingLogSink {
-  static {
-    System.loadLibrary("jingle_peerconnection_so");
-  }
-
-  private long nativeSink;
-
-  public static byte[] getLogData(String dirPath) {
-    return nativeGetLogData(dirPath);
-  }
-
-  public CallSessionFileRotatingLogSink(
-      String dirPath, int maxFileSize, Logging.Severity severity) {
-    nativeSink = nativeAddSink(dirPath, maxFileSize, severity.ordinal());
-  }
-
-  public void dispose() {
-    if (nativeSink != 0) {
-      nativeDeleteSink(nativeSink);
-      nativeSink = 0;
-    }
-  }
-
-  private static native long nativeAddSink(
-      String dirPath, int maxFileSize, int severity);
-  private static native void nativeDeleteSink(long nativeSink);
-  private static native byte[] nativeGetLogData(String dirPath);
-}