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

Change-Id: I75d1f8ea4b2b17ea8860f4aa7bb65b7e1d7247d0