Merge changes Ifbd15bf9,I985e6861,I54860c7c into nyc-dev

* changes:
  Make FirewallController::createChain use replaceUidChain.
  Make firewallReplaceUidChain match the behaviour of createChain.
  Don't crash the test if expecting more commands than were run.
tree: 78b1e37e9a31d2dc2956e4847dc38ad250e7e256
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE