Package up proguard jack_dictionary

Bug: 31182185
Bug: 31240674
Test: m dist in an unbundled branch
(cherry picked from commit b6c061e9ffa5208b0b2dae0a5a88694925c6b527)
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
diff --git a/core/Makefile b/core/Makefile
index 7676a4f..5badde5 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2041,7 +2041,7 @@
 # the dependency will be set up later in build/core/main.mk.
 $(PROGUARD_DICT_ZIP) :
 	@echo "Packaging Proguard obfuscation dictionary files."
-	$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \
+	$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary -o -name jack_dictionary`; \
 		if [ -n "$$dict_files" ]; then \
 		  unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
 		  zip -qX $@ $$dict_files $$unobfuscated_jars; \