Merge "resourceloader: Move expandModuleNames() to ResourceLoader.php"