Revert 96655 - Revert 96639 - Roll Skia 2096 -> 2108.

Revert 96655 - Revert 96639 - Roll Skia 2096 -> 2108.
It was found to be not the culprit of redness

Whitespace change: http://codereview.chromium.org/7633020

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7633030

TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/7618026

TBR=ctguil@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96662