Backed out 2 changesets (bug 895015, bug 893434) for Android test_asmjs timeouts on a CLOSED TREE.

Backed out changeset cadcb731a8fb (bug 895015)
Backed out changeset 17404ee140f3 (bug 893434)