am e7a89f5f: am a3131862: Merge "kill HAVE_INOTIFY"

* commit 'e7a89f5fa76c58c595d9d9660d7111125e9a492d':
  kill HAVE_INOTIFY