After closer examination, it appears that the new APIs are only for OpenBSD kernel developers. Userspace developers are just supposed to trust the kernel and not call any primitive to add to the entropy pool. So commenting out the call to arc4random_addrandom() is indeed the correct workaround.
And the fix will simply be to add a sysdep for that function call. -- Laurent