Android: Replace webrtc_jni namespace with nested jni namespace

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

Index: webrtc/sdk/android/src/jni/androidmediadecoder_jni.h
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.h b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.h
index be536fae560e4cbbe5181ba922ef63681d7d3722..b971647c6c3a3a47e3b7a1ff611b3e3d032d2322 100644
--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.h
+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.h
@@ -14,7 +14,8 @@
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 // Implementation of Android MediaCodec based decoder factory.
 class MediaCodecVideoDecoderFactory
@@ -26,16 +27,16 @@ class MediaCodecVideoDecoderFactory
   void SetEGLContext(JNIEnv* jni, jobject render_egl_context);
 
   // WebRtcVideoDecoderFactory implementation.
-  webrtc::VideoDecoder* CreateVideoDecoder(webrtc::VideoCodecType type)
-      override;
+  VideoDecoder* CreateVideoDecoder(VideoCodecType type) override;
 
-  void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override;
+  void DestroyVideoDecoder(VideoDecoder* decoder) override;
 
  private:
   jobject egl_context_;
-  std::vector<webrtc::VideoCodecType> supported_codec_types_;
+  std::vector<VideoCodecType> supported_codec_types_;
 };
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDMEDIADECODER_JNI_H_