Merge "Use module_current to build module stubs" into rvc-dev