Back out b5854baf067d (bug 884004) for Android mochitest failures