Merge "logd: gtest: logd.timeout socket does not clean up properly" am: 7d24dea9cb am: 64d7c7fcb4 am: c6b59d9d8a
am: 44f60cbe9b

Change-Id: I8bfe57d8e45efc72d056c628ebd829f43fc87d06