Android O IOT Preview 5 (OIR1.170720.015)
-----BEGIN PGP SIGNATURE-----

iEUEABECAAYFAlmTZyYACgkQ6K0/gZqxDnhJiwCWKPgpsaaJY3Jb499aq/4QV7Jp
8gCfbsptp7sDB2QitkUBf2vFv3yXVcc=
=RLr5
-----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