Upstream: Update contents for libexec changes