Kevin McCarthy reemerges to fight California redistricting