solana: fix missing files from device merges