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

Change-Id: I3ca333142b258e9309f55e1160161b2420d3601a