autoboot: follow-up cleanup after CONFIG_BOOTDELAY moves