Merge changes Ia11dffde,I76f24890

* changes:
  Convert libnetutils to Android.bp
  Don't export libutils_headers from libbase