Revert of https://codereview.chromium.org/109793005/
Reason for revert: It breaks some chromedriver tests on FYI android bot and as a result blocks chromedriver release of 2.8.

TBR=craigdh@chromium.org,frankf@chromium.org
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241028 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 241028