Merge "releasetools: Generalize base_fs_file handling."
am: 066fac7c8c

Change-Id: I3bbf8e9ed2d3091136c88399fa952bb347dc8907