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

webrtc/api/android/jni/surfacetexturehelper_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_SURFACETEXTUREHELPER_JNI_H_
 #define WEBRTC_API_JAVA_JNI_SURFACETEXTUREHELPER_JNI_H_
 
 #include <jni.h>
 
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 
 namespace webrtc_jni {
 
 // Helper class to create and synchronize access to an Android SurfaceTexture.
 // It is used for creating webrtc::VideoFrameBuffers from a SurfaceTexture when
 // the SurfaceTexture has been updated.
 // When the VideoFrameBuffer is released, this class returns the buffer to the
@@ skipping 31 matching lines @@
   SurfaceTextureHelper(JNIEnv* jni, jobject j_surface_texture_helper);
 
  private:
   const ScopedGlobalRef<jobject> j_surface_texture_helper_;
   const jmethodID j_return_texture_method_;
 };
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_API_JAVA_JNI_SURFACETEXTUREHELPER_JNI_H_