Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/pc/media_jni.h

 /*
  *  Copyright 2017 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.
  */
 
@@ skipping 10 matching lines @@
 class RtcEventLogFactoryInterface;
 class AudioMixer;
 }  // namespace webrtc
 
 namespace cricket {
 class MediaEngineInterface;
 class WebRtcVideoEncoderFactory;
 class WebRtcVideoDecoderFactory;
 }  // namespace cricket
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
-webrtc::CallFactoryInterface* CreateCallFactory();
-webrtc::RtcEventLogFactoryInterface* CreateRtcEventLogFactory();
+CallFactoryInterface* CreateCallFactory();
+RtcEventLogFactoryInterface* CreateRtcEventLogFactory();
 
 cricket::MediaEngineInterface* CreateMediaEngine(
-    webrtc::AudioDeviceModule* adm,
-    const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
-        audio_encoder_factory,
-    const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
-        audio_decoder_factory,
+    AudioDeviceModule* adm,
+    const rtc::scoped_refptr<AudioEncoderFactory>& audio_encoder_factory,
+    const rtc::scoped_refptr<AudioDecoderFactory>& audio_decoder_factory,
     cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
     cricket::WebRtcVideoDecoderFactory* video_decoder_factory,
-    rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer);
+    rtc::scoped_refptr<AudioMixer> audio_mixer);
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_PC_MEDIA_JNI_H_