Merge "Only have a single call into pdfium at a time." into nyc-mr1-dev
am: 1b109c31bc

Change-Id: I38f8bf07d677b08c417ed2f19b04501dcde11085