Merge cherrypicks of ['googleplex-android-review.googlesource.com/26450009'] into 24Q2-release.
Change-Id: Iab4a0afc1220512509f811dd9594bf9ffe5bae30
diff --git a/device.mk b/device.mk
index 4df284d..3f64285 100644
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,6 @@
include device/google/gs-common/misc_writer/misc_writer.mk
include device/google/gs-common/gyotaku_app/gyotaku.mk
include device/google/gs-common/bootctrl/bootctrl_aidl.mk
-include device/google/gs-common/betterbug/betterbug.mk
ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),)
include device/google/gs-common/bcmbt/dump/dumplog.mk
endif