Merge "Fix the use of pdfium" am: abbe6d35ca

Change-Id: Ia45006c682d8bfe1f678d74832c27db10fd23005