Revert 49283 - Broke Linux-shlib compile - Skia roll r562:r575
Revert 49283 - Broke Linux-shlib compile - Skia roll r562:r575

BUG=21149

TBR=agl@chromium.org
Review URL: http://codereview.chromium.org/2711008

git-svn-id: http://src.chromium.org/svn/trunk/src@49290 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: 76ec0c5c9c42a5e0a581a1a0f014694ebed50636
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser