Backed out changesets 8305a602f997 and 51a1e963d908 (bug 826176) for Android mochitest failures.