Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/jni/androidmediaencoder_jni.h

Index: webrtc/api/java/jni/androidmediaencoder_jni.h
diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.h b/webrtc/api/java/jni/androidmediaencoder_jni.h
deleted file mode 100644
index 4e507007107d09fa98cf4596d43c9e06a391a1fa..0000000000000000000000000000000000000000
--- a/webrtc/api/java/jni/androidmediaencoder_jni.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  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.
- */
-
-#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_
-#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_
-
-#include <vector>
-
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-
-namespace webrtc_jni {
-
-// Implementation of Android MediaCodec based encoder factory.
-class MediaCodecVideoEncoderFactory
-    : public cricket::WebRtcVideoEncoderFactory {
- public:
-  MediaCodecVideoEncoderFactory();
-  virtual ~MediaCodecVideoEncoderFactory();
-
-  void SetEGLContext(JNIEnv* jni, jobject egl_context);
-
-  // WebRtcVideoEncoderFactory implementation.
-  webrtc::VideoEncoder* CreateVideoEncoder(webrtc::VideoCodecType type)
-      override;
-  const std::vector<VideoCodec>& codecs() const override;
-  void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
-
- private:
-  jobject egl_context_;
-
-  // Empty if platform support is lacking, const after ctor returns.
-  std::vector<VideoCodec> supported_codecs_;
-};
-
-}  // namespace webrtc_jni
-
-#endif  // WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_