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

webrtc/api/android/jni/androidmetrics_jni.cc

 /*
  *  Copyright 2016 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 <map>
 #include <memory>
 
-#include "webrtc/api/java/jni/classreferenceholder.h"
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/api/java/jni/native_handle_impl.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/native_handle_impl.h"
 #include "webrtc/system_wrappers/include/metrics_default.h"
 
 // Enables collection of native histograms.
 namespace webrtc_jni {
 JOW(void, Metrics_nativeEnable)(JNIEnv* jni, jclass) {
   webrtc::metrics::Enable();
 }
 
 // Gets and clears native histograms.
 JOW(jobject, Metrics_nativeGetAndReset)(JNIEnv* jni, jclass) {
@@ skipping 23 matching lines @@
     // Add |HistogramInfo| to |Metrics|.
     jstring j_name = jni->NewStringUTF(kv.first.c_str());
     jni->CallVoidMethod(j_metrics, j_add, j_name, j_info);
     jni->DeleteLocalRef(j_name);
     jni->DeleteLocalRef(j_info);
   }
   CHECK_EXCEPTION(jni);
   return j_metrics;
 }
 }  // namespace webrtc_jni