Merge "liblog: deal with restart of logd"