am a3131862: Merge "kill HAVE_INOTIFY"

* commit 'a31318620bce4e00e80188ee2778b7799cbdf0dc':
  kill HAVE_INOTIFY