Merge "Kill logd in buildbot-setup.sh." am: 589e13337d
am: 318c0ba6e2

Change-Id: I98cb427e5632da9b1fa12302d5890937563b5d27