Bug 967120 - Follow-up to fix broken xpcshell and mochitests