Use our prebuilt M4 for flex and bison
And ensure we've got all the proper dependencies.
Bug: 117561006
Test: treehugger
Change-Id: Ia9690b2c0d73a48744c8e33fe83196d02b1e904d
diff --git a/core/config.mk b/core/config.mk
index 4cc78b8..1fe0f7f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -553,6 +553,7 @@
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