Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/test/androidtestinitializer.cc

 /*
  *  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.
  */
 
 #include "webrtc/api/test/androidtestinitializer.h"
 
 #include <pthread.h>
 
 // Note: this dependency is dangerous since it reaches into Chromium's base.
 // There's a risk of e.g. macro clashes. This file may only be used in tests.
 // Since we use Chromes build system for creating the gtest binary, this should
 // be fine.
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 
 namespace webrtc {
 
 namespace {
 
 static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT;
 
@@ skipping 14 matching lines @@
   webrtc::VoiceEngine::SetAndroidObjects(jvm, context);
 }
 
 }  // anonymous namespace
 
 void InitializeAndroidObjects() {
   RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
 }
 
 }  // namespace webrtc