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

Change-Id: I870e080a585dfe8077199808a07b838d1665f3f8