diff --git a/core/config.mk b/core/config.mk
index cfa8a33759..a8368ed0db 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -694,7 +694,7 @@ HOST_JDK_TOOLS_JAR :=
 # http://b/38418220
 ifndef USE_OPENJDK9
 HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA_TOOLCHAIN)/../lib/tools.jar
-endif # ifdef USE_OPENJDK9
+endif # ifndef USE_OPENJDK9
 
 # It's called md5 on Mac OS and md5sum on Linux
 ifeq ($(HOST_OS),darwin)
diff --git a/core/java.mk b/core/java.mk
index bc8281fff4..bede18649c 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -568,6 +568,8 @@ endif
 
 $(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
 
+# Temporarily enable --multi-dex until proguard supports v53 class files
+# ( http://b/67673860 ) or we move away from proguard altogether.
 ifdef TARGET_OPENJDK9
 LOCAL_DX_FLAGS := $(filter-out --multi-dex,$(LOCAL_DX_FLAGS)) --multi-dex
 endif