diff --git a/src/modules/video_coding/codecs/vp8/main/source/Android.mk b/src/modules/video_coding/codecs/vp8/main/source/Android.mk
index e09dce4404..eb6c1af889 100644
--- a/src/modules/video_coding/codecs/vp8/main/source/Android.mk
+++ b/src/modules/video_coding/codecs/vp8/main/source/Android.mk
@@ -18,8 +18,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
     reference_picture_selection.cc \
-    vp8.cc \
-    vp8_simulcast.cc
+    vp8.cc
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
diff --git a/src/video_engine/vie_impl.cc b/src/video_engine/vie_impl.cc
index d697e00711..d8a421bb9d 100644
--- a/src/video_engine/vie_impl.cc
+++ b/src/video_engine/vie_impl.cc
@@ -206,7 +206,7 @@ int VideoEngine::SetTraceCallback(TraceCallback* callback) {
   return Trace::SetTraceCallback(callback);
 }
 
-int VideoEngine::SetAndroidObjects(void* javaVM, void* java_context) {
+int VideoEngine::SetAndroidObjects(void* javaVM, void* javaContext) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVideo, g_vie_active_instance_counter,
                "SetAndroidObjects()");