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

Change-Id: I9fe8d6cb8e88e875043c0c86d78a2e35584ca527