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

Change-Id: I2359bdd74b27c1da2928fd3bc910f729588064b0