resolve unit test warnings
remove a redundant file in encDemo project
Merge pull request #924 from ruil2/expand_pic_1

resolve unit test warnings