resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp
am: b74b4ad38f

* commit 'b74b4ad38fa162d3fe09e035fa570f419261c7dd':
  Make dhcpcd-6.8.2 admit that it uses BSD extensions.

Change-Id: Idc1accf23b67aadda5894f902f6c06d59ae2ed01
diff --git a/Android.mk b/Android.mk
index 8a5a9b2..36ab085 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,6 +52,8 @@
 LOCAL_SRC_FILES += script-stub.c
 endif
 
+LOCAL_CFLAGS += -D_BSD_SOURCE
+
 ifeq ($(DHCPCD_USE_IPV6), yes)
 LOCAL_SRC_FILES += ipv6.c ipv6nd.c dhcp6.c
 LOCAL_SRC_FILES += crypt/sha256.c