Merge "releasetools: Generalize base_fs_file handling."