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