Revert of https://codereview.chromium.org/131363003/
Reason for revert: Broke Android compile

TBR=abarth@chromium.org,jam@chromium.org,ager@chromium.org,eseidel@chromium.org,vegorov@google.com,wibling@chromium.org,vegorov@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=

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

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