Merge to XFA: Speculative fix for breakage in pdfum DEPS roll