SPI-specific internal build instruction changes from Sosh