diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRTCAudioDevice.java b/webrtc/modules/audio_device/android/org/webrtc/voiceengine/WebRTCAudioDevice.java
similarity index 100%
rename from webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRTCAudioDevice.java
rename to webrtc/modules/audio_device/android/org/webrtc/voiceengine/WebRTCAudioDevice.java
diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi
index 62cbf1c662..6ee3c8d986 100644
--- a/webrtc/modules/audio_device/audio_device.gypi
+++ b/webrtc/modules/audio_device/audio_device.gypi
@@ -182,18 +182,6 @@
     },
   ],
   'conditions': [
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'audio_device_module_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'android/java',
-          },
-          'includes': [ '../../../build/java.gypi' ],
-        },
-      ],
-    }],
     ['include_tests==1', {
       'targets': [
         {
diff --git a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java b/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java
similarity index 100%
rename from webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java
rename to webrtc/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java
diff --git a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
similarity index 100%
rename from webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java
rename to webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
diff --git a/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java b/webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
similarity index 100%
rename from webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
rename to webrtc/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi
index b53b681f13..bb45a11da5 100644
--- a/webrtc/modules/video_capture/video_capture.gypi
+++ b/webrtc/modules/video_capture/video_capture.gypi
@@ -121,21 +121,6 @@
     },
   ],
   'conditions': [
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'video_capture_module_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'android/java',
-          },
-          'dependencies': [
-            'video_render_module_java',
-          ],
-          'includes': [ '../../../build/java.gypi' ],
-        },
-      ],
-    }],
     ['include_tests==1', {
       'targets': [
         {
diff --git a/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java b/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java
similarity index 100%
rename from webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java
rename to webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java
diff --git a/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java b/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java
similarity index 100%
rename from webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
rename to webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java
diff --git a/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java b/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java
similarity index 100%
rename from webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java
rename to webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java
diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi
index f3be6c754f..cb0abadaa6 100644
--- a/webrtc/modules/video_render/video_render.gypi
+++ b/webrtc/modules/video_render/video_render.gypi
@@ -154,18 +154,6 @@
   ], # targets
 
   'conditions': [
-    ['OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'video_render_module_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'android/java',
-          },
-          'includes': [ '../../../build/java.gypi' ],
-        },
-      ],
-    }],
     ['include_internal_video_render==1', {
       'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',],
     }],
diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi
index df3989968b..c7f3ed1a18 100644
--- a/webrtc/video_engine/test/android/android_video_demo.gypi
+++ b/webrtc/video_engine/test/android/android_video_demo.gypi
@@ -20,9 +20,15 @@
         {
           # TODO(leozwang): Convert building of the demo to a proper GYP target
           # so this action and the custom build script is not needed.
-          # (http://crbug.com/255101)
           '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',