Merge "resourceloader: Minor clean up in saveFileDependencies()"