Merge changes from topic 'netd_aosp' am: d480f8af85
am: 7217fc7f75

Change-Id: Ibbbe253d3ac8d3b1afe8f7a0c7e487dd7ba0565c
tree: 4f6e3677faa8867472f6e7536f3020e274802785
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE