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

Change-Id: I7ee918327855356185268ba0dbbbc7aa73eaa507