Backed out changeset 3b8dcd393805 (bug 859705) for intermittent Android xpcshell failures on a CLOSED TREE.