Remove unused WAIT_TIMEOUT_SECONDS from some tests

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

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

Modify android code to avoid depending on side effects of previous
steps when in BUILDBOT_TESTING mode.  This is causing failure on
chromium_presubmit.  Fix some pylint warnings.

BUG=317585

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

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