Merge RTCConfiguration with RTCMediaConstraints in Java/Obj-C wrappers.

webrtc/sdk/android/api/org/webrtc/PeerConnection.java

Index: webrtc/sdk/android/api/org/webrtc/PeerConnection.java
diff --git a/webrtc/sdk/android/api/org/webrtc/PeerConnection.java b/webrtc/sdk/android/api/org/webrtc/PeerConnection.java
index b4ad5795fe04c2c34c9a7890d597220e4c4fd5ba..0eea5da0c2000677becfbf4ea521c4e9651ef947 100644
--- a/webrtc/sdk/android/api/org/webrtc/PeerConnection.java
+++ b/webrtc/sdk/android/api/org/webrtc/PeerConnection.java
@@ -197,7 +197,9 @@ public class PeerConnection {
 
   public native void setRemoteDescription(SdpObserver observer, SessionDescription sdp);
 
-  public native boolean setConfiguration(RTCConfiguration config);
+  public boolean setConfiguration(RTCConfiguration config) {
+    return nativeSetConfiguration(config, nativeObserver);
+  }
 
   public boolean addIceCandidate(IceCandidate candidate) {
     return nativeAddIceCandidate(candidate.sdpMid, candidate.sdpMLineIndex, candidate.sdp);
@@ -299,6 +301,8 @@ public class PeerConnection {
 
   private static native void freeObserver(long nativeObserver);
 
+  public native boolean nativeSetConfiguration(RTCConfiguration config, long nativeObserver);
+
   private native boolean nativeAddIceCandidate(
       String sdpMid, int sdpMLineIndex, String iceCandidateSdp);