Take module APIs out of the module_current stubs am: 822cdb30 am: de6df6c7 am: 435c38f8 am: 8dea86cf Change-Id: I0937d6a6cd3b6a2f4ead1055ff9c55751a52906a