Merge "Introduce inotify-based replacements for fs_mgr_wait_for_file."