Merge "libcutils: sockets_test breaks MAC build"