Merge "Take module APIs out of the module_current stubs" into rvc-dev am: 93f9bb04 am: 601fbf91 am: d0a57d84 am: 8c193ca4 Change-Id: I48c04336200934364c45a74ee5d87c78c7c409f2