U.S. judge sets April 21 deadline for VW, EPA to reach diesel fix