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

This reverts commit b412c6c61d958a86e0117c496f99a36964ea3b5c.