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

Change-Id: Ib67e7bde8bef48e2e2be5c7d045aa9a96b00d292