Merge "resourceloader: Move packaging to a new getModuleContent() method"