Merge "liblog: add a timeout for logd command socket operations"