diff --git a/webrtc/modules/audio_device/android/org/webrtc/voiceengine/WebRTCAudioDevice.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRTCAudioDevice.java
similarity index 100%
rename from webrtc/modules/audio_device/android/org/webrtc/voiceengine/WebRTCAudioDevice.java
rename to webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRTCAudioDevice.java
diff --git a/webrtc/modules/modules_java.gyp b/webrtc/modules/modules_java.gyp
new file mode 100644
index 0000000000..e59d2bd41c
--- /dev/null
+++ b/webrtc/modules/modules_java.gyp
@@ -0,0 +1,39 @@
+# Copyright (c) 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'audio_device_module_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'audio_device/android/java',
+      },
+      'includes': [ '../../build/java.gypi' ],
+    }, # audio_device_module_java
+    {
+      'target_name': 'video_capture_module_java',
+      'type': 'none',
+      'dependencies': [
+        'video_render_module_java',
+      ],
+      'variables': {
+        'java_in_dir': 'video_capture/android/java',
+      },
+      'includes': [ '../../build/java.gypi' ],
+    }, # video_capture_module_java
+    {
+      'target_name': 'video_render_module_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'video_render/android/java',
+      },
+      'includes': [ '../../build/java.gypi' ],
+    }, # video_render_module_java
+  ],
+}
diff --git a/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java
similarity index 100%
rename from webrtc/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java
rename to webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java
diff --git a/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
similarity index 100%
rename from webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
rename to webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
diff --git a/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java b/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
similarity index 100%
rename from webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
rename to webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
diff --git a/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java b/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java
similarity index 100%
rename from webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java
rename to webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java
diff --git a/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java b/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
similarity index 100%
rename from webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java
rename to webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
diff --git a/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java b/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java
similarity index 100%
rename from webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java
rename to webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java
diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi
index d69cac35bf..b09d745092 100644
--- a/webrtc/video_engine/test/android/android_video_demo.gypi
+++ b/webrtc/video_engine/test/android/android_video_demo.gypi
@@ -69,6 +69,11 @@
       '<(PRODUCT_DIR)/libcommon_audio_neon.a',
       '<(PRODUCT_DIR)/libvpx_arm_neon.a',
     ],
+    'android_modules_java_jars': [
+      '<(PRODUCT_DIR)/lib.java/audio_device_module_java.jar',
+      '<(PRODUCT_DIR)/lib.java/video_capture_module_java.jar',
+      '<(PRODUCT_DIR)/lib.java/video_render_module_java.jar',
+    ],
   },
 
   'targets': [
@@ -84,6 +89,7 @@
       ],
       'dependencies': [
         '<(webrtc_root)/modules/modules.gyp:*',
+        '<(webrtc_root)/modules/modules_java.gyp:*',
         '<(webrtc_root)/test/test.gyp:channel_transport',
         '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
         '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
@@ -94,18 +100,12 @@
           # so this action and the custom build script is not needed.
           'action_name': 'build_video_demo_apk',
           'inputs' : [
-            '<(webrtc_root)/modules/audio_device/android/org/webrtc/voiceengine/WebRTCAudioDevice.java',
-            '<(webrtc_root)/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java',
-            '<(webrtc_root)/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java',
-            '<(webrtc_root)/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java',
-            '<(webrtc_root)/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java',
-            '<(webrtc_root)/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java',
-            '<(webrtc_root)/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java',
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengine/ViEMediaCodecDecoder.java',
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/IViEAndroidCallback.java',
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java',
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java',
             '<@(android_mk_common_libs)',
+            '<@(android_modules_java_jars)',
           ],
           'outputs': ['<(webrtc_root)'],
           'action': ['python',