Merge "Take module APIs out of the module_current stubs" am: b7a4febf02

Change-Id: Id53ffaedb8cb82e7d94bd7df8e7dd09f3356ae94