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

It used to be that there was a Java api for devices not running Android
but that is no longer the case. I combined the directories and made
the folder structure chromium style.

BUG=webrtc:6067
R=magjed@webrtc.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/2111823002 .

Cr-Commit-Position: refs/heads/master@{#13356}

webrtc/api/api_java.gyp

@@ -34,14 +34,12 @@
             'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
             'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
             'chromium_code': 1,
-            'java_in_dir': 'java',
+            'java_in_dir': 'android/java',
             'webrtc_base_dir': '<(webrtc_root)/base',
             'webrtc_modules_dir': '<(webrtc_root)/modules',
             'additional_src_dirs' : [
-              'java/android',
-              '<(webrtc_base_dir)/java/src',
+              '<(webrtc_base_dir)/java',
               '<(webrtc_modules_dir)/audio_device/android/java/src',
-
             ],
           },
           'includes': ['../../build/java.gypi'],