Merge "Separate out lists of modules from build rules"