Merge "Make android_net_NetUtils include what it actually uses."
am: e8f373e442

* commit 'e8f373e442a301691aa8f35f1dfb46e8149b450b':
  Make android_net_NetUtils include what it actually uses.

Change-Id: Iddc38891a66e6a868eef3af4ce025c7d7af1fb15