Merge "Refactor how MODULES-IN-* is defined"