Separate style modules from JS modules

If you use addModuleStyles AND addModules you add the stylesheet
twice. Thus separate styles into their own modules.

Change-Id: I750abadb4feb00edc7d51dd11322be5514ba87b5
Merge "Separate style modules from JS modules"