Merge "Take module APIs out of the module_current stubs" into rvc-dev am: 93f9bb04 am: 5b816a3d am: 28b355b8 Change-Id: I99e742becab16d4ac83ee43954e88ab68ba88a19