Clean up fold encoding#570

Dev-XYS wants to merge 2 commits intomasterviperproject/carbon:masterfrom

yxiao_cleanup_fold_encodingviperproject/carbon:yxiao_cleanup_fold_encodingCopy head branch name to clipboard