Merge "Kill logd in buildbot-setup.sh."