Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/androidmediaencoder_jni.h

Index: webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
index 08f5502c860408d3ded948d6de95d00fbd5ced27..4b3be4e598ce0b581dea342f9815fe6bb167720f 100644
--- a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
+++ b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.h
@@ -16,7 +16,8 @@
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 // Implementation of Android MediaCodec based encoder factory.
 class MediaCodecVideoEncoderFactory
@@ -28,10 +29,9 @@ class MediaCodecVideoEncoderFactory
   void SetEGLContext(JNIEnv* jni, jobject egl_context);
 
   // WebRtcVideoEncoderFactory implementation.
-  webrtc::VideoEncoder* CreateVideoEncoder(
-      const cricket::VideoCodec& codec) override;
+  VideoEncoder* CreateVideoEncoder(const cricket::VideoCodec& codec) override;
   const std::vector<cricket::VideoCodec>& supported_codecs() const override;
-  void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
+  void DestroyVideoEncoder(VideoEncoder* encoder) override;
 
  private:
   jobject egl_context_;
@@ -41,6 +41,7 @@ class MediaCodecVideoEncoderFactory
   std::vector<cricket::VideoCodec> supported_codecs_with_h264_hp_;
 };
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIAENCODER_JNI_H_