Initial import of brkfix into goma src