Follow CreateModule change to take an android.ModuleFactory
am: 24c4cc88ca

Change-Id: I337f138611957ef45e4830cc13aceeae1b424fad