Merge "resourceloader: Remove redundant var-freeing in addScript()"