Merge to XFA: Update bundled freetype to 2.6.1

pdfium.gyp

 {
   'variables': {
     'pdf_use_skia%': 0,
     'pdf_enable_v8%': 1,
     'pdf_enable_xfa%': 1,
     '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' : [
       'OPJ_STATIC',
       'PNG_PREFIX',
       'PNGPREFIX_H',
       'PNG_USE_READ_MACROS',
       'V8_DEPRECATION_WARNINGS',
       '_CRT_SECURE_NO_WARNINGS',
     ],
     'include_dirs': [
       'third_party/freetype/include',
+      'third_party/freetype/include/freetype',
     ],
     'conditions': [
       ['pdf_use_skia==1', {
         'defines': ['_SKIA_SUPPORT_'],
       }],
       ['pdf_enable_v8==1', {
         'defines': ['PDF_ENABLE_V8'],
       }],
       ['pdf_enable_xfa==1', {
         'defines': ['PDF_ENABLE_XFA'],
@@ skipping 806 matching lines @@
           ],
           'dependencies': [
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
             '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
           ],
         }],
       ],
     },
   ],
 }