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

Change-Id: I083eeb909d24ecd33451bb5cd23c03d6f724f052