(Merge 3.1) Issue #12057: Add cjkencodings directory to the Makefile and
Tools/msi/msi.py