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

webrtc/api/api_java.gyp

 # Copyright (c) 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.
 
 # This file exists only because there's no other way to avoid errors in the
 # Chromium build due to the inclusion of build/java.gypi. GYP unfortunately
@@ skipping 16 matching lines @@
           'dependencies': [
             '<(webrtc_root)/api/api.gyp:libjingle_peerconnection_so',
           ],
           'variables': {
             # Designate as Chromium code and point to our lint settings to
             # enable linting of the WebRTC code (this is the only way to make
             # lint_action invoke the Android linter).
             'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
             'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
             'chromium_code': 1,
-            'java_in_dir': 'android/java',
+            'java_in_dir': 'java',
             'webrtc_base_dir': '<(webrtc_root)/base',
             'webrtc_modules_dir': '<(webrtc_root)/modules',
             'additional_src_dirs' : [
-              '<(webrtc_base_dir)/java',
+              'java/android',
+              '<(webrtc_base_dir)/java/src',
               '<(webrtc_modules_dir)/audio_device/android/java/src',
+
             ],
           },
           'includes': ['../../build/java.gypi'],
         },
       ],  # targets
     }],  # OS=="android"
   ],  # conditions
 }