Remove deprecated methods from CameraEnumerationAndroid.

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

Index: webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
diff --git a/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
index 239318ab89aff2dc22f95aaaa5f34603ea334fdd..429daf5dc35ee2c77636d84dd531053fb4ee6c48 100644
--- a/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
+++ b/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
@@ -10,12 +10,10 @@
 
 package org.webrtc;
 
-import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
-
 import android.os.SystemClock;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
 
 @SuppressWarnings("deprecation")
 public class Camera1Enumerator implements CameraEnumerator {
@@ -89,7 +87,7 @@ public class Camera1Enumerator implements CameraEnumerator {
   static synchronized List<CaptureFormat> getSupportedFormats(int cameraId) {
     if (cachedSupportedFormats == null) {
       cachedSupportedFormats = new ArrayList<List<CaptureFormat>>();
-      for (int i = 0; i < CameraEnumerationAndroid.getDeviceCount(); ++i) {
+      for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
         cachedSupportedFormats.add(enumerateFormats(i));
       }
     }
@@ -164,7 +162,7 @@ public class Camera1Enumerator implements CameraEnumerator {
   static int getCameraIndex(String deviceName) {
     Logging.d(TAG, "getCameraIndex: " + deviceName);
     for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
-      if (deviceName.equals(CameraEnumerationAndroid.getDeviceName(i))) {
+      if (deviceName.equals(getDeviceName(i))) {
         return i;
       }
     }