diff --git a/core/config.mk b/core/config.mk
index 2863e7d055..b928af0885 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -587,8 +587,16 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
 # ---------------------------------------------------------------
 # Generic tools.
 
-# These dependencies are now handled via dependencies on prebuilt_build_tool
-BISON_DATA :=$=
+LEX := $(prebuilt_build_tools_bin_noasan)/flex
+# The default PKGDATADIR built in the prebuilt bison is a relative path
+# prebuilts/build-tools/common/bison.
+# To run bison from elsewhere you need to set up enviromental variable
+# BISON_PKGDATADIR.
+BISON_PKGDATADIR := $(prebuilt_build_tools)/common/bison
+BISON := $(prebuilt_build_tools_bin_noasan)/bison
+YACC := $(BISON) -d
+BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)/*/*)
+M4 :=$= $(prebuilt_build_tools_bin_noasan)/m4
 
 YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm
 
diff --git a/core/main.mk b/core/main.mk
index cb8aa601da..f718c9d4b2 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -33,8 +33,6 @@ endif
 
 include $(SOONG_MAKEVARS_MK)
 
-YACC :=$= $(BISON) -d
-
 include $(BUILD_SYSTEM)/clang/config.mk
 
 # Write the build number to a file so it can be read back in