Merge "Add 'honggfuzz' and 'fuzz' to all ASAN / coverage builds"
diff --git a/target/product/base.mk b/target/product/base.mk
index f4f9016..8a94179 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -173,7 +173,9 @@
     sanitizer-status
 
 # Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
-PRODUCT_PACKAGES_DEBUG_ASAN :=
+PRODUCT_PACKAGES_DEBUG_ASAN := \
+    fuzz \
+    honggfuzz
 
 PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
     frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)