diff --git a/core/main.mk b/core/main.mk
index 4671601f6..1067e95e5 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -904,6 +904,7 @@ files: $(modules_to_install) \
 
 .PHONY: checkbuild
 checkbuild: $(modules_to_check) droid_targets
+checkbuild: checkbuild-soong
 
 ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT))
 droid: checkbuild
diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index d9f9ea8d8..d4fb47a9c 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -16,6 +16,9 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),)
 $(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))
 endif
 
+# Not much sense to check build prebuilts
+LOCAL_DONT_CHECK_MODULE := true
+
 my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)
 
 ifdef LOCAL_PREBUILT_MODULE_FILE
@@ -35,8 +38,6 @@ else
   endif
 endif
 
-LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file)
-
 my_strip_module := $(firstword \
   $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \
   $(LOCAL_STRIP_MODULE))