Merge "resourceloader: Remove selective build optimisation from getModuleContent()"