mod. remove shutil dependency.

Change-Id: I108e78d0b25e02fbb7097e7e46ec1865d1cd4e9c