Merge "Take module APIs out of the module_current stubs" into rvc-dev am: 93f9bb0485 am: 601fbf91a4

Change-Id: I0cc84d5fcde4bd4540c73f81baceea4c293fa2e0