Revert of https://codereview.chromium.org/99283006/
Reason for revert: Broke Android bot again

TBR=mef@chromium.org,mmenke@chromium.org,bengr@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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