CFPB avoids GOP defunding in Trump bill