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

webrtc/api/api.gyp

Index: webrtc/api/api.gyp
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index 3ab0bf91a41847c0c10ba06cec124b1cbc90a7a0..eb8c9c07ead4dc7ff5b4312252c1669e4c818803 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -35,27 +35,27 @@
             'libjingle_peerconnection',
           ],
           'sources': [
+            'android/jni/androidmediacodeccommon.h',
+            'android/jni/androidmediadecoder_jni.cc',
+            'android/jni/androidmediadecoder_jni.h',
+            'android/jni/androidmediaencoder_jni.cc',
+            'android/jni/androidmediaencoder_jni.h',
+            'android/jni/androidmetrics_jni.cc',
+            'android/jni/androidnetworkmonitor_jni.cc',
+            'android/jni/androidnetworkmonitor_jni.h',
+            'android/jni/androidvideocapturer_jni.cc',
+            'android/jni/androidvideocapturer_jni.h',
+            'android/jni/classreferenceholder.cc',
+            'android/jni/classreferenceholder.h',
+            'android/jni/jni_helpers.cc',
+            'android/jni/jni_helpers.h',
+            'android/jni/native_handle_impl.cc',
+            'android/jni/native_handle_impl.h',
+            'android/jni/peerconnection_jni.cc',
+            'android/jni/surfacetexturehelper_jni.cc',
+            'android/jni/surfacetexturehelper_jni.h',
             'androidvideocapturer.cc',
             'androidvideocapturer.h',
-            'java/jni/androidmediacodeccommon.h',
-            'java/jni/androidmediadecoder_jni.cc',
-            'java/jni/androidmediadecoder_jni.h',
-            'java/jni/androidmediaencoder_jni.cc',
-            'java/jni/androidmediaencoder_jni.h',
-            'java/jni/androidmetrics_jni.cc',
-            'java/jni/androidnetworkmonitor_jni.cc',
-            'java/jni/androidnetworkmonitor_jni.h',
-            'java/jni/androidvideocapturer_jni.cc',
-            'java/jni/androidvideocapturer_jni.h',
-            'java/jni/surfacetexturehelper_jni.cc',
-            'java/jni/surfacetexturehelper_jni.h',
-            'java/jni/classreferenceholder.cc',
-            'java/jni/classreferenceholder.h',
-            'java/jni/jni_helpers.cc',
-            'java/jni/jni_helpers.h',
-            'java/jni/native_handle_impl.cc',
-            'java/jni/native_handle_impl.h',
-            'java/jni/peerconnection_jni.cc',
           ],
           'include_dirs': [
             '<(libyuv_dir)/include',
@@ -83,7 +83,7 @@
             'libjingle_peerconnection_jni',
           ],
           'sources': [
-           'java/jni/jni_onload.cc',
+           'android/jni/jni_onload.cc',
           ],
           'variables': {
             # This library uses native JNI exports; tell GYP so that the