Revert of https://codereview.chromium.org/113973004/
Reason for revert: Broke Android build

TBR=erik.corry@gmail.com,vegorov@chromium.org,wibling@chromium.org,zerny@chromium.org
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/105743009

git-svn-id: svn://svn.chromium.org/blink/trunk@164009 bbb929c8-8fbe-4397-9dbb-9b2b20218538