Merge "api/current.txt: Add SOCK_CLOEXEC and SOCK_NONBLOCK"
am: 1d709c965b

Change-Id: Ic46472dba6ef8be9d43a8ab237f8ed16d873a752