Refine EncDemo.
Revert "ut_win32"

This reverts commit 462f56d4130f4061aa467e5e1178d44c276fdea9.
Merge pull request #1292 from zhilwang/EncDemo_refine

Refine EncDemo.
Merge remote-tracking branch 'upstream/master' into travis.osx