Revert of Revert of Skia roll c773390:5c4b137

Revert of Revert of Skia roll c773390:5c4b137 (patchset #1 of https://codereview.chromium.org/476763003/)

Reason for revert:
Win x64 bot continues to fail, so it seems this was not the problem.  Reverting the revert.

Original issue's description:
> Revert of Skia roll c773390:5c4b137 (patchset #1 of https://codereview.chromium.org/474933003/)
> 
> Reason for revert:
> Broke gfx_unittests on Win7 x64 build bot for two consecutive builds.  First breakage:
> 
> http://build.chromium.org/p/chromium.win/buildstatus?builder=Win%207%20Tests%20x64%20%283%29&number=15634
> 
> Original issue's description:
> > Skia roll c773390:5c4b137
> > 
> > https://skia.googlesource.com/skia/+log/c773390eefe70d13faab147a70bd9319b9ac3afb..5c4b137592a7937b4d02d72a976fa783f8d3675a
> > 
> > CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_layout_rel
> > TBR=bsalomon@google.com
> > BUG=
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289662
> 
> TBR=bsalomon@google.com,skia-deps-roller@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289705

TBR=bsalomon@google.com,skia-deps-roller@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=

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

[miu, 2014-08-14 23:19:57]

Created Revert of Revert of Skia roll c773390:5c4b137

[commit-bot: I haz the power, 2014-08-14 23:24:35]

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

[commit-bot: I haz the power, 2014-08-14 23:29:09]

Committed patchset #1 (1) as 289721