Backed out changeset 302fb81f0729 (bug 858940) for frequent Android test crashes.