Reland of Support adding and removing MediaRecorder to camera 2 session.

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

Index: webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java b/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java
index 7718f5aea385309bdc9d34b157fd88d21b3bc550..769a94a60c0b07611745fa19e0a17034c71c26ba 100644
--- a/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java
+++ b/webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java
@@ -13,6 +13,7 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.camera2.CameraManager;
+import android.media.MediaRecorder;
 
 @TargetApi(21)
 public class Camera2Capturer extends CameraCapturer {
@@ -29,9 +30,9 @@
   @Override
   protected void createCameraSession(CameraSession.CreateSessionCallback createSessionCallback,
       CameraSession.Events events, Context applicationContext,
-      SurfaceTextureHelper surfaceTextureHelper, String cameraName, int width, int height,
-      int framerate) {
+      SurfaceTextureHelper surfaceTextureHelper, MediaRecorder mediaRecoder, String cameraName,
+      int width, int height, int framerate) {
     Camera2Session.create(createSessionCallback, events, applicationContext, cameraManager,
-        surfaceTextureHelper, cameraName, width, height, framerate);
+        surfaceTextureHelper, mediaRecoder, cameraName, width, height, framerate);
   }
 }