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