Merge "Group core-current-stubs-gen and core.current.stubs targets"