Android: Replace webrtc_jni namespace with nested jni namespace

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

Index: webrtc/sdk/android/src/jni/classreferenceholder.h
diff --git a/webrtc/sdk/android/src/jni/classreferenceholder.h b/webrtc/sdk/android/src/jni/classreferenceholder.h
index 0d4ccc44a89ba26dfa0a1263cdcb0a742831ff5f..646725ac3901c1e4d827c38f5154df6ee63a25a9 100644
--- a/webrtc/sdk/android/src/jni/classreferenceholder.h
+++ b/webrtc/sdk/android/src/jni/classreferenceholder.h
@@ -20,7 +20,8 @@
 #include <map>
 #include <string>
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 // LoadGlobalClassReferenceHolder must be called in JNI_OnLoad.
 void LoadGlobalClassReferenceHolder();
@@ -31,6 +32,15 @@ void FreeGlobalClassReferenceHolder();
 // process.
 jclass FindClass(JNIEnv* jni, const char* name);
 
+}  // namespace jni
+}  // namespace webrtc
+
+// TODO(magjed): Remove once external clients are updated.
+namespace webrtc_jni {
+
+using webrtc::jni::LoadGlobalClassReferenceHolder;
+using webrtc::jni::FreeGlobalClassReferenceHolder;
+
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_