Merge "liblog: use SOCK_NONBLOCK directly." am: fca43d3ec5
am: 33f8c194f9

Change-Id: I742833b2933d1ab17543839f9749a7c4d7f13944