Merge changes I2dc1a074,Ic83d8160,I246696c4 into nyc-dev

* changes:
  Move SockDiagTest into system/netd/server.
  Add an RPC to replace a UID firewall rule.
  Allow finer-grained locking, and use it in FirewallCmd.
tree: bc947a702245959939b6801030defd3b76df99b7
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE