diff --git a/core/base_rules.mk b/core/base_rules.mk
index 7e33660..fcf3549 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -238,6 +238,8 @@
 
 # Kati adds restat=1 to ninja. GNU make does nothing for this.
 .KATI_RESTAT: $(LOCAL_BUILT_MODULE).toc
+# Build .toc file when using mm, mma, or make $(my_register_name)
+$(my_register_name): $(LOCAL_BUILT_MODULE).toc
 endif
 endif
 
diff --git a/core/clang/config.mk b/core/clang/config.mk
index b215c6f..5014a6f 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -4,7 +4,7 @@
 LLVM_PREBUILTS_VERSION ?= clang-2577113
 LLVM_PREBUILTS_BASE ?= prebuilts/clang/host
 LLVM_PREBUILTS_PATH := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
-LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_RELEASE_VERSION)/lib/linux/
+LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib64/clang/$(LLVM_RELEASE_VERSION)/lib/linux/
 
 CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
 CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)