diff --git a/core/config.mk b/core/config.mk
index ddedc5b25..dca72899a 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -516,6 +516,12 @@ endif
 
 USE_PREBUILT_SDK_TOOLS_IN_PLACE := true
 
+# Work around for b/68406220
+# This should match the soong version.
+ifndef USE_D8
+  USE_D8 := true
+endif
+
 #
 # Tools that are prebuilts for TARGET_BUILD_APPS
 #