Merge "Take module APIs out of the module_current stubs" into rvc-dev am: 93f9bb04 am: 601fbf91 am: 374b7655 Change-Id: I8b6f5c6da97a63c927ab1649fdebc88b5eeae04a