Revert "skia: Fix build in ISO C++ 11 mode"

This reverts commit 63a8b82c79d4e898e8befdf8162ad9b1b26e40f0.
Revert "skia: Fix build in ISO C++11 mode"

This reverts commit 87a7c5bef79d7f5bec154cfac02dc0a3fd4551ec.