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

Change-Id: I96cc291b80e9548fc52061dfa6128307835858c9