Merge "fs_mgr: Fix executable path in clean_scratch_files." into rvc-dev