Change Camera1Enumerator to create a Camera1Capturer instead of VideoCapturerAndroid.

BUG=webrtc:6148

Review-Url: https://codereview.webrtc.org/2356073003
Cr-Commit-Position: refs/heads/master@{#14478}

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

@@ -72,7 +72,7 @@ public class Camera1Enumerator implements CameraEnumerator {
   @Override
   public CameraVideoCapturer createCapturer(
       String deviceName, CameraVideoCapturer.CameraEventsHandler eventsHandler) {
-    return new VideoCapturerAndroid(deviceName, eventsHandler, captureToTexture);
+    return new Camera1Capturer(deviceName, eventsHandler, captureToTexture);
   }
 
   private static android.hardware.Camera.CameraInfo getCameraInfo(int index) {

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

@@ -38,7 +38,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 // 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,