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: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@49290 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser