o3d: Fix o3d build.
o3d: Fix o3d build.

This reverts the changes did on http://src.chromium.org/viewvc/chrome?view=rev&revision=69785

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/5970006

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

Former-commit-id: 0f96c438329b1c514818ad4f22856fed53a2f6f7
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