Revert of Skia roll 14765:14795

Revert of Skia roll 14765:14795 (https://codereview.chromium.org/296483006/)

Reason for revert:
Official Win build failing: http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/24516/steps/compile/logs/stdio

Original issue's description:
> Skia roll 14765:14795
> 
> https://code.google.com/p/skia/source/list?num=29&start=14795
> TBR=
> BUG=
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271728

TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271742

[f(malita), 2014-05-20 21:01:50]

Created Revert of Skia roll 14765:14795

[commit-bot: I haz the power, 2014-05-20 21:05:24]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fmalita@chromium.org/292273002/1

[commit-bot: I haz the power, 2014-05-20 21:07:46]

Change committed as 271742