Merge "fs_mgr: use different fstab paths for normal/recovery boot"