am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an...
am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."
* commit '90ae787b':
Backwards and forwards compatibility for an upcoming <sys/socket.h> change.