Backed out changeset f4f3b1e4a0e5 (bug 1020497) for b2g debug emulator mochitest-1 failures