(fixup) fix bootimage build / tests