Revert of Skia roll 87c4138:49e3199

Revert of Skia roll 87c4138:49e3199 (patchset #1 id:1 of https://codereview.chromium.org/554293002/)

Reason for revert:
read the bot results wrong.  we did break a test

Original issue's description:
> Skia roll 87c4138:49e3199
> 
> https://skia.googlesource.com/skia/+log/87c4138fae37ba6b7e4de7acc3fce19524d726ea..49e3199e638595d7e8b8bf41081eb9cac5daaa2d
> 
> CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_dbg
> TBR=fmalita@google.com
> 
> Failing tests are failing with and without this CL.
> NOTRY=true
> 
> Committed: https://chromium.googlesource.com/chromium/src/+/3903c20d4c27bfc0092ed9056d43f4837288ef60

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

Committed: https://crrev.com/0f21991bc07973c7839abadcf32c5d2eb4262070
Cr-Commit-Position: refs/heads/master@{#293939}

[mtklein, 2014-09-09 14:40:04]

Created Revert of Skia roll 87c4138:49e3199

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

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mtklein@google.com/553013002/1

[commit-bot: I haz the power, 2014-09-09 14:40:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-09 14:40:25]

No LGTM from a valid reviewer yet. Only full committers are accepted.
Even if an LGTM may have been provided, it was from a non-committer or
a provisional committer, _not_ a full super star committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[f(malita), 2014-09-09 14:41:25]

fmalita@chromium.org changed reviewers:
+ fmalita@chromium.org

[f(malita), 2014-09-09 14:41:25]

The CQ bit was checked by fmalita@chromium.org

[f(malita), 2014-09-09 14:41:26]

lgtm

[commit-bot: I haz the power, 2014-09-09 14:42:26]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/mtklein@google.com/553013002/1

[commit-bot: I haz the power, 2014-09-09 14:43:31]

Committed patchset #1 (id:1) as 4bf7a683ab61226ccacd1a5657a3e51affe9e557

[commit-bot: I haz the power, 2014-09-10 03:53:22]

Patchset 1 (id:??) landed as
https://crrev.com/0f21991bc07973c7839abadcf32c5d2eb4262070
Cr-Commit-Position: refs/heads/master@{#293939}