Merge "Fix $(PROGUARD_DICT_ZIP) builds" into main