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

Change-Id: Ie592d9ca48425a4311df86f69bf2209c78c90d01