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

webrtc/api/android/jni/jni_helpers.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/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
 
 #include <asm/unistd.h>
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 
 namespace webrtc_jni {
 
 static JavaVM* g_jvm = nullptr;
 
@@ skipping 318 matching lines @@
   RTC_CHECK(!AtEnd());
   return value_;
 }
 
 bool Iterable::Iterator::AtEnd() const {
   RTC_CHECK(thread_checker_.CalledOnValidThread());
   return jni_ == nullptr || IsNull(jni_, iterator_);
 }
 
 }  // namespace webrtc_jni