Merge "Revert "Rename libevent-host to libevent""