Merge "Remove fs_mgr_wait_for_file."
am: 0b5c3552cc

Change-Id: Ib1f605c7a975c738cda8f2cb017f06b890ab6df9