diff --git a/build/Android.common.mk b/build/Android.common.mk
index a0e9df1..75d360c 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -116,9 +116,11 @@
 ART_DEFAULT_GC_TYPE ?= CMS
 ART_DEFAULT_GC_TYPE_CFLAGS := -DART_DEFAULT_GC_TYPE_IS_$(ART_DEFAULT_GC_TYPE)
 
-LLVM_ROOT_PATH := external/llvm
-# Don't fail a dalvik minimal host build.
--include $(LLVM_ROOT_PATH)/llvm.mk
+ifeq ($(ART_USE_PORTABLE_COMPILER),true)
+  LLVM_ROOT_PATH := external/llvm
+  # Don't fail a dalvik minimal host build.
+  -include $(LLVM_ROOT_PATH)/llvm.mk
+endif
 
 # Clang build support.
 # Target builds use GCC by default.
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index d9d392f..a224de2 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -78,31 +78,32 @@
   0;
 
 CompilationUnit::CompilationUnit(ArenaPool* pool)
-  : compiler_driver(NULL),
-    class_linker(NULL),
-    dex_file(NULL),
-    class_loader(NULL),
+  : compiler_driver(nullptr),
+    class_linker(nullptr),
+    dex_file(nullptr),
+    class_loader(nullptr),
     class_def_idx(0),
     method_idx(0),
-    code_item(NULL),
+    code_item(nullptr),
     access_flags(0),
     invoke_type(kDirect),
-    shorty(NULL),
+    shorty(nullptr),
     disable_opt(0),
     enable_debug(0),
     verbose(false),
-    compiler(NULL),
+    compiler(nullptr),
     instruction_set(kNone),
+    target64(false),
     num_dalvik_registers(0),
-    insns(NULL),
+    insns(nullptr),
     num_ins(0),
     num_outs(0),
     num_regs(0),
     compiler_flip_match(false),
     arena(pool),
     arena_stack(pool),
-    mir_graph(NULL),
-    cg(NULL),
+    mir_graph(nullptr),
+    cg(nullptr),
     timings("QuickCompiler", true, false) {
 }
 
diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc
index dc2769e..554fbbe 100644
--- a/runtime/gc/space/large_object_space.cc
+++ b/runtime/gc/space/large_object_space.cc
@@ -140,7 +140,8 @@
 size_t LargeObjectMapSpace::Free(Thread* self, mirror::Object* ptr) {
   MutexLock mu(self, lock_);
   MemMaps::iterator found = mem_maps_.find(ptr);
-  CHECK(found != mem_maps_.end()) << "Attempted to free large object which was not live";
+  CHECK(found != mem_maps_.end()) << "Attempted to free large object" << ptr
+      << "which was not live";
   DCHECK_GE(num_bytes_allocated_, found->second->Size());
   size_t allocation_size = found->second->Size();
   num_bytes_allocated_ -= allocation_size;
diff --git a/test/Android.mk b/test/Android.mk
index 6e37af3..9b79abf 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -110,6 +110,7 @@
 
 # Used outside the art project to get a list of the current tests
 ART_TEST_DEX_MAKE_TARGETS := $(addprefix art-test-dex-, $(TEST_DEX_DIRECTORIES))
+ART_TEST_OAT_MAKE_TARGETS := $(addprefix oat-test-dex-, $(TEST_OAT_DIRECTORIES))
 
 # Rules to explicitly create 2nd-arch test directories, as we use a "cp" for them
 # instead of BUILD_JAVA_LIBRARY