Fixing handling of FS watcher
Fixing handling of FS watcher

Once realized that watchers watch the directory and all the files
underneath (non-recursively), it get easier to handle the watchers.

google/navc,google/navc,google/navc