Backed out changesets 77a94dc888c9 and 3f6e6912e71a (bug 831144) for Android mochitest failures on a CLOSED TREE.