Fix bad merge causing b2g mochitest bustage