Incorporate changes from CPAN release of ExtUtils-CBuilder