diff --git a/Android.mk b/Android.mk
index 01aedc3e81..511fa0ab6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,17 +23,17 @@ include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/media_file/source/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/rtp_rtcp/source/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/udp_transport/source/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk
 #include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/source/Android.mk
 
 # video
@@ -93,7 +93,7 @@ LOCAL_PRELINK_MODULE := false
 ifndef NDK_ROOT
 include external/stlport/libstlport.mk
 endif
-#include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_SHARED_LIBRARY)
 
 ###