Take module APIs out of the module_current stubs am: 822cdb3031 am: de6df6c702

Change-Id: I1fc74e29b85c2415d6108ff3ba22e30ede67c6c3