Back out db542ae460d9 (bug 983399) for b2g debug xpcshell bustage