Merge "resourceloader: Remove redundant closure of some startup and base files"