Time Warner is folding its comic-book unit, DC Comics, into its studio and renaming the operation DC Entertainment, a week after Disney agreed to buy Marvel.