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

Change-Id: I89bd7db8cc5b6723fa2a5cee9b785f7ad8f6c276