Android: Replace webrtc_jni namespace with nested jni namespace

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

 /*
  *  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_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_
 
 #include <stdint.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "webrtc/rtc_base/networkmonitor.h"
 #include "webrtc/rtc_base/thread_checker.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 typedef int64_t NetworkHandle;
 
 // c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.
 enum NetworkType {
   NETWORK_UNKNOWN,
   NETWORK_ETHERNET,
   NETWORK_WIFI,
   NETWORK_4G,
   NETWORK_3G,
@@ skipping 51 matching lines @@
   std::map<NetworkHandle, NetworkInformation> network_info_by_handle_;
 };
 
 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {
  public:
   AndroidNetworkMonitorFactory() {}
 
   rtc::NetworkMonitorInterface* CreateNetworkMonitor() override;
 };
 
+}  // namespace jni
+}  // namespace webrtc
+
+// TODO(magjed): Remove once external clients are updated.
+namespace webrtc_jni {
+
+using webrtc::jni::AndroidNetworkMonitor;
+using webrtc::jni::AndroidNetworkMonitorFactory;
+
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_PC_ANDROIDNETWORKMONITOR_JNI_H_