Merge "libcutils: sockets_test breaks MAC build" am: 8d339e940f am: d32e7f4703
am: cca5e721b2

Change-Id: I120611c01cc93224aa643ef5b268da9ff013e54e