diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk
index 5fff51027..a5d1439a2 100644
--- a/src/system_wrappers/source/Android.mk
+++ b/src/system_wrappers/source/Android.mk
@@ -23,8 +23,9 @@ LOCAL_SRC_FILES := \
     aligned_malloc.cc \
     atomic32.cc \
     condition_variable.cc \
-    cpu.cc \
+    cpu_dummy.cc \
     cpu_features.cc \
+    cpu_info.cc \
     critical_section.cc \
     event.cc \
     file_impl.cc \
diff --git a/src/voice_engine/main/test/auto_test/Android.mk b/src/voice_engine/main/test/auto_test/Android.mk
index 81d157dab..cfb9d670f 100644
--- a/src/voice_engine/main/test/auto_test/Android.mk
+++ b/src/voice_engine/main/test/auto_test/Android.mk
@@ -17,11 +17,13 @@ include $(LOCAL_PATH)/../../../../../android-webrtc.mk
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES:= \
+    automated_mode.cc \
     voe_cpu_test.cc \
     voe_standard_test.cc \
     voe_stress_test.cc \
     voe_unit_test.cc \
-    voe_extended_test.cc 
+    voe_extended_test.cc \
+    voe_standard_integration_test.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \