Merge "Introduce inotify-based replacements for fs_mgr_wait_for_file."
am: 02427f5f71

Change-Id: I7ad373379b1b4ab059bb2cedc5d39dbfdbaf4324