Android o preview 4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlmI+sgACgkQ6K0/gZqxDngjCgCgkAM9JerTbhFdjrHiLCCt96ve
YTcAn23pOvelxJe+uGVEa9rqIO7v/YX8
=QsQx
-----END PGP SIGNATURE-----
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