Backed out 2 changesets (bug 1048110) for various Android mochitest failures on a CLOSED TREE

Backed out changeset 1cf6f4f27811 (bug 1048110)
Backed out changeset b89f54e21c0b (bug 1048110)