am 2c1eb2fe: am d8e38e1b: Merge "kill HAVE_INOTIFY"

* commit '2c1eb2fe213ec9a9c66fd75b6224a4396c919e59':
  kill HAVE_INOTIFY