Revert of https://codereview.chromium.org/101423004/
Reason for revert: broke some win7 bots

R=bungeman@google.com, reed@google.com, zheng.xu@arm.com, robertphillips@google.com, rmistry@google.com
TBR=bungeman@google.com, reed@google.com, zheng.xu@arm.com
NOTREECHECKS=true
NOTRY=true
BUG=

Author: bensong@google.com

Review URL: https://codereview.chromium.org/119943002

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