Bug 1055305, add more abbreviations for builder names, r=catlee