Android: Replace webrtc_jni namespace with nested jni namespace

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

Index: webrtc/sdk/android/src/jni/jni_helpers.h
diff --git a/webrtc/sdk/android/src/jni/jni_helpers.h b/webrtc/sdk/android/src/jni/jni_helpers.h
index 7400d3218a29058ab5af7c3af945d1920e2a3c25..618c8f62402bab359654e89c93a9818233e530c4 100644
--- a/webrtc/sdk/android/src/jni/jni_helpers.h
+++ b/webrtc/sdk/android/src/jni/jni_helpers.h
@@ -39,7 +39,8 @@
 #define JNI_FUNCTION_DECLARATION(rettype, name, ...) \
   extern "C" JNIEXPORT rettype JNICALL Java_org_webrtc_##name(__VA_ARGS__)
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 jint InitGlobalJniVariables(JavaVM *jvm);
 
@@ -204,6 +205,15 @@ class Iterable {
   RTC_DISALLOW_COPY_AND_ASSIGN(Iterable);
 };
 
+}  // namespace jni
+}  // namespace webrtc
+
+// TODO(magjed): Remove once external clients are updated.
+namespace webrtc_jni {
+
+using webrtc::jni::AttachCurrentThreadIfNeeded;
+using webrtc::jni::InitGlobalJniVariables;
+
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_JNI_HELPERS_H_