Merge "fs_mgr: libfstab: allow recovery.fstab with suffix" into main