Merge changes I86257bc8,I5c2221c5 into nyc-dev
am: 4a992cbde8

* commit '4a992cbde834fdf3770e34b21361b47f4786f65f':
  Use Netd's binder interface to set resolver configuration.
  Add Gservices settings for resolver configuration.

Change-Id: I26969ef34712d12d6e8a2801f2c790a07f710492