Backed out changeset f3c055585a4f (bug 843857) for B2G mochitest bustage.
Merge m-c to inbound on a CLOSED TREE. a=ryanvmneedstoquitfortheday