Merge "fs_mgr: properly propagate exec child errors"