Merge "init: keychord inotify add IN_ONLYDIR"
am: c8dd6b74e6

Change-Id: I876090858fd38c16456a93d5da196b8cf57975b1