Merge pull request dart-lang/watcher#25 from dart-lang/backport

Backport fixes from master to 0.9.7+x.
tree: 112ebf74379d3f23f9e6ece70351c9893b3f5ba0
  1. pkgs/