diff --git a/core/binary.mk b/core/binary.mk
index b635de0e7a..711022ecf0 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -118,7 +118,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
   LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
 
-# Add in libcompiler-rt for all regular device builds
+# Add in libcompiler_rt for all regular device builds
 ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
   LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
diff --git a/core/java.mk b/core/java.mk
index 4064f6ce07..8ed686f4cb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -210,11 +210,11 @@ $(rs_generated_bc) : $(RenderScript_file_stamp)
 ifeq (,$(TARGET_BUILD_APPS))
 rs_built_clcore := $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libclcore.bc_intermediates/libclcore.bc
 rs_extra_libpath :=
-rs_compiler_rt := $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler-rt)/libcompiler-rt.a
+rs_compiler_rt := $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler-rt)/libcompiler_rt.a
 else
 rs_built_clcore := prebuilts/sdk/renderscript/lib/libclcore.bc
 rs_extra_libpath := -L prebuilts/ndk/8/platforms/android-9/arch-arm/usr/lib
-rs_compiler_rt := prebuilts/sdk/renderscript/lib/libcompiler-rt.a
+rs_compiler_rt := prebuilts/sdk/renderscript/lib/libcompiler_rt.a
 endif # TARGET_BUILD_APPS
 rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so
 rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so
diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index df562e19a8..2018e31844 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -106,4 +106,4 @@ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan
 
 # This allows us to use the superset of functionality that compiler-rt
 # provides to Clang (for supporting features like -ftrapv).
-COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler-rt-extras
+COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras