Merge "Add genrule for combined srcjar of modules"