Merge XFA to PDFium master at 4dc95e7 on 10/28/2014