Merge "Correct inotify usage and fix strong count accounting error" into oc-dev
am: 3941fc8a67

Change-Id: I5ea6ca8dd67ceac14e8d90d263917c02c0563896