guard cwd restore to win32-only (from "not android")
closes #2337
Merge pull request #2368 from admsyn/bugfix-datapath-warnings

guard cwd restore to win32-only (from "not android")