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

webrtc/api/java/jni/androidvideocapturer_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_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
 #define WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
 
 #include <memory>
 #include <string>
 
 #include "webrtc/api/androidvideocapturer.h"
-#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/java/jni/jni_helpers.h"
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 
 namespace webrtc_jni {
 
 struct NativeHandleImpl;
 class SurfaceTextureHelper;
@@ skipping 63 matching lines @@
   std::unique_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
 
   static jobject application_context_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
 };
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_