Merge "Fix the use of pdfium" into rvc-dev am: d5f905df8f

Change-Id: I85ed44e08d3ee93b34caf471474aabe1d2cae840