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

Change-Id: I9b85ce8d123fa4e3eeb81599a167b0f1855b5e64