Backed out changeset faf24511d2c6 (bug 861636) for Android mochitest-2 failures