Merge "Re-submit "Add genrule for combined srcjar of modules""