diff --git a/build/Android.common.mk b/build/Android.common.mk
index bc1825e..41edefa 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -192,7 +192,7 @@
 	src/compiler_llvm/inferred_reg_category_map.cc \
 	src/compiler_llvm/runtime_support_llvm.cc \
 	src/compiler_llvm/utils_llvm.cc
-else
+endif
 LIBART_COMMON_SRC_FILES += \
 	src/oat/runtime/arm/stub_arm.cc \
 	src/oat/runtime/context.cc \
@@ -217,7 +217,6 @@
 	src/oat/utils/assembler.cc \
 	src/oat/utils/x86/assembler_x86.cc \
 	src/oat/utils/x86/managed_register_x86.cc
-endif
 
 LIBART_TARGET_SRC_FILES := \
 	$(LIBART_COMMON_SRC_FILES) \
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index a646b6f..75ced8b 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -314,13 +314,12 @@
 
 extern "C" art::CompiledMethod* ArtJniCompileMethod(art::Compiler& compiler,
                                                     uint32_t access_flags, uint32_t method_idx,
-                                                    const art::ClassLoader* class_loader,
                                                     const art::DexFile& dex_file) {
   art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker();
   art::DexCache *dex_cache = class_linker->FindDexCache(dex_file);
 
   art::OatCompilationUnit oat_compilation_unit(
-    class_loader, class_linker, dex_file, *dex_cache, NULL,
+    NULL, class_linker, dex_file, *dex_cache, NULL,
     method_idx, access_flags);
 
   art::compiler_llvm::CompilerLLVM* compiler_llvm = ContextOf(compiler);
diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index 0a203e9..02a201a 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -4,7 +4,7 @@
 #include "dex_verifier.h"
 #include "object.h"
 #include "object_utils.h"
-#include "runtime_support_common.h"
+#include "runtime_support.h"
 #include "runtime_support_llvm.h"
 #include "shadow_frame.h"
 #include "thread.h"