Perl: Merge upstream snappy changes