Merge "Handle PDFium API change" into pi-dev am: 173d0e9b34
am: 9449d80441

Change-Id: I8ce1328234178baa790cf9c56526afe43fdf2af8