Change Camera1Enumerator to create a Camera1Capturer instead of VideoCapturerAndroid.

webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java

 /*
  *  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.
  */
 
@@ skipping 20 matching lines @@
 // An instance of this class can be created by an application using
 // VideoCapturerAndroid.create();
 // This class extends VideoCapturer with a method to easily switch between the
 // front and back camera. It also provides methods for enumerating valid device
 // names.
 //
 // Threading notes: this class is called from C++ code, Android Camera callbacks, and possibly
 // arbitrary Java threads. All public entry points are thread safe, and delegate the work to the
 // camera thread. The internal *OnCameraThread() methods must check |camera| for null to check if
 // the camera has been stopped.
-// TODO(magjed): This class name is now confusing - rename to Camera1VideoCapturer.
+//
+// This class is deprecated and will only be used if you manually create it. Please use
+// Camera1Capturer instead.
+@Deprecated
 @SuppressWarnings("deprecation")
 public class VideoCapturerAndroid
     implements CameraVideoCapturer, android.hardware.Camera.PreviewCallback,
                SurfaceTextureHelper.OnTextureFrameAvailableListener {
   private static final String TAG = "VideoCapturerAndroid";
   private static final int CAMERA_STOP_TIMEOUT_MS = 7000;
 
   private android.hardware.Camera camera; // Only non-null while capturing.
   private final AtomicBoolean isCameraRunning = new AtomicBoolean();
   // Use maybePostOnCameraThread() instead of posting directly to the handler - this way all
@@ skipping 561 matching lines @@
     cameraStatistics.addFrame();
     frameObserver.onTextureFrameCaptured(captureFormat.width, captureFormat.height, oesTextureId,
         transformMatrix, rotation, timestampNs);
   }
 
   @Override
   public boolean isScreencast() {
     return false;
   }
 }