Auto merge of #1256 - vdagonneau:master, r=gnzlbg

Moved inotify declarations up so that it works on android too.

Following my previous pull request to include inotify bindings, I would like to move the code so that it benefits android too.