Merge "Revert "Add genrule for combined srcjar of modules""