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

webrtc/api/android/jni/classreferenceholder.cc

Index: webrtc/api/android/jni/classreferenceholder.cc
diff --git a/webrtc/api/java/jni/classreferenceholder.cc b/webrtc/api/android/jni/classreferenceholder.cc
similarity index 98%
rename from webrtc/api/java/jni/classreferenceholder.cc
rename to webrtc/api/android/jni/classreferenceholder.cc
index 3d8f304aa1c66701679e37aaed3b2f3fabaed0f3..be5cde248f00df5a832d1886cbfc52407c1f54bb 100644
--- a/webrtc/api/java/jni/classreferenceholder.cc
+++ b/webrtc/api/android/jni/classreferenceholder.cc
@@ -7,9 +7,9 @@
  *  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/classreferenceholder.h"
+#include "webrtc/api/android/jni/classreferenceholder.h"
 
-#include "webrtc/api/java/jni/jni_helpers.h"
+#include "webrtc/api/android/jni/jni_helpers.h"
 
 namespace webrtc_jni {