Merge the following changes to XFA branch:

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,
+      }],    
+    ],
   },
   'target_defaults': {
     'defines' : [
-      'FT2_BUILD_LIBRARY',
       '_FPDFSDK_LIB',
       '_NO_GDIPLUS_',  # workaround text rendering issues on Windows
       'OPJ_STATIC',
     ],
     'include_dirs': [
       'third_party/freetype/include',
     ],
     'conditions': [
       ['pdf_use_skia==1', {
         'defines': ['_SKIA_SUPPORT_'],
@@ skipping 13 matching lines @@
     'msvs_disabled_warnings': [
       4005, 4018, 4146, 4333, 4345, 4267
     ],
   },
   'targets': [
     {
       'target_name': 'pdfium',
       'type': 'static_library',
       'dependencies': [
         'third_party/third_party.gyp:bigint',
-        'third_party/third_party.gyp:freetype',
         'third_party/third_party.gyp:safemath',
         'fdrm',
         'fpdfdoc',
         'fpdfapi',
         'fpdftext',
         'formfiller',
         'fxcodec',
         'fxcrt',
         'fxedit',
         'fxge',
@@ skipping 44 matching lines @@
         'fpdfsdk/src/resource.h',
         'fpdfsdk/include/fpdf_transformpage.h',
         'fpdfsdk/src/fpdf_transformpage.cpp',
       ],
       'conditions': [
         ['OS!="win"', {
           'sources!': [
             'fpdfsdk/src/fpdfsdkdll.rc',
           ],
         }],
+        ['bundle_freetype==1', {
+          'dependencies': [
+            'third_party/third_party.gyp:freetype',
+          ],
+        }, {
+          'link_settings': {
+            'libraries': [
+              '-lfreetype',
+            ],
+          },
+        }],
       ],
       'all_dependent_settings': {
         'msvs_settings': {
           'VCLinkerTool': {
             'AdditionalDependencies': [
               'advapi32.lib',
               'gdi32.lib',
               'user32.lib',
             ],
           },
@@ skipping 809 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',
       ],
     },
   ],
 }