Merge the following commit to XFA:

pdfium.gyp

 {
   'variables': {
     'pdf_use_skia%': 0,
     'conditions': [
       ['OS=="linux"', {
         'bundle_freetype%': 0,
       }, {  # On Android there's no system FreeType. On Windows and Mac, only a
             # few methods are used from it.
         'bundle_freetype%': 1,
       }],    
@@ skipping 353 matching lines @@
         'core/src/fxcodec/fx_libopenjpeg/src/fx_j2k_lib.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_jpt.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_mqc.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_openjpeg.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_openjpeg_jp2.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_opj_clock.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_pi.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_raw.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_t1.c',
-        'core/src/fxcodec/fx_libopenjpeg/src/fx_t1_generate_luts.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_t2.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_tcd.c',
         'core/src/fxcodec/fx_libopenjpeg/src/fx_tgt.c',
         'core/src/fxcodec/fx_lpng/include/fx_png.h',
         'core/src/fxcodec/fx_lpng/src/fx_png.c',
         'core/src/fxcodec/fx_lpng/src/fx_pngerror.c',
         'core/src/fxcodec/fx_lpng/src/fx_pngget.c',
         'core/src/fxcodec/fx_lpng/src/fx_pngmem.c',
         'core/src/fxcodec/fx_lpng/src/fx_pngpread.c',
         'core/src/fxcodec/fx_lpng/src/fx_pngread.c',
@@ skipping 557 matching lines @@
         'fpdfsdk/src/fpdftext_embeddertest.cpp',
         'fpdfsdk/src/fpdfview_embeddertest.cpp',
         'testing/embedder_test.cpp',
         'testing/embedder_test.h',
         'testing/fx_string_testhelpers.cpp',
         'testing/fx_string_testhelpers.h',
       ],
     },
   ],
 }