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

Change-Id: I1f80d00b49f51f3438b208b6201120820a3cdc55