MFC r266396 and r267183:
Build fixes. Add support for fast interrupts.