Don't use deprecated ResourceLoader::makeLoaderURL

Change-Id: Id8acfb5a233b6bdb6d092c3e166575756bc0fa5b
Merge "Don't use deprecated ResourceLoader::makeLoaderURL"