Android CTS 8.0 Release 12 (4890494)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW3MZ0wAKCRDorT+BmrEO
eLATAJ0XYUvpHUoc9PasbHC1HTjEz1hNkACfeYNm1kiHy47q4C+6zxXv/tUgFSo=
=nC7V
-----END PGP SIGNATURE-----
resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp am: b74b4ad38f
am: df64c96f01

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

Change-Id: Ibcc09804d01f0105a14ad07615e39d8007b5d5cf