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

webrtc/api/android/jni/androidmediacodeccommon.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_ANDROIDMEDIACODECCOMMON_H_
 #define WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_
 
 #include <android/log.h>
 #include <string>
 
 #include "webrtc/base/thread.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/logging.h"
 #include "webrtc/base/thread.h"
 
 namespace webrtc_jni {
 
 // Uncomment this define to enable verbose logging for every encoded/decoded
 // video frame.
 //#define TRACK_BUFFER_TIMING
 
 #define TAG_COMMON "MediaCodecVideo"
@@ skipping 53 matching lines @@
     jni->ExceptionDescribe();
     jni->ExceptionClear();
     return true;
   }
   return false;
 }
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_API_JAVA_JNI_ANDROIDMEDIACODECCOMMON_H_