Merge "logd: don't poll() before recvmsg()"