Fix Windows build - revert r8056 and r8057

TBR=epoger,edisonn
Review URL: https://codereview.chromium.org/12421010

git-svn-id: http://skia.googlecode.com/svn/trunk@8058 2bbb7eff-a529-9590-31e7-b0007b416f81
2 files changed