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

Backport fixes from master to 0.9.7+x.