Merge the following changes to XFA branch:

BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 
 pdf_use_skia = false
 
+declare_args() {
+  # On Android there's no system FreeType. On Windows and Mac, only a few
+  # methods are used from it.
+  bundle_freetype = !is_linux
+}
+
 config("pdfium_config") {
   cflags = []
-  include_dirs = [
-    "third_party/freetype/include"
-  ]
+  include_dirs = [ "third_party/freetype/include" ]
   defines = [
-    "FT2_BUILD_LIBRARY",
     "_FPDFSDK_LIB",
     "_NO_GDIPLUS_",  # workaround text rendering issues on Windows
+    "OPJ_STATIC",
   ]
 
   if (pdf_use_skia) {
     defines += [ "_SKIA_SUPPORT_" ]
   }
 
   if (is_linux) {
     if (cpu_arch == "x64") {
       defines += [ "_FX_CPU_=_FX_X64_" ]
       cflags += [ "-fPIC" ]
@@ skipping 56 matching lines @@
     "fpdfsdk/include/fpdf_transformpage.h",
     "fpdfsdk/src/fpdf_transformpage.cpp",
   ]
 
   libs = []
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
 
   deps = [
     "third_party:bigint",
-    "third_party:freetype",
     "third_party:safemath",
     ":fdrm",
     ":formfiller",
     ":fpdfapi",
     ":fpdfdoc",
     ":fpdftext",
     ":fpdfxfa",
     ":fxcodec",
     ":fxcrt",
     ":fxedit",
     ":fxge",
     ":javascript",
     ":jsapi",
     ":pdfwindow",
     ":xfa",
   ]
 
   if (is_win) {
     libs += [ "advapi32.lib", "gdi32.lib", "user32.lib" ]
   }
 
   if (is_mac) {
     libs += [ "AppKit.framework", "CoreFoundation.framework" ]
   }
+
+  if (bundle_freetype) {
+    deps += [ "third_party:freetype" ]
+  } else {
+    libs += [ "freetype" ]
+  }
 }
 
 # Targets below this are only visible within this file.
 visibility = [ ":*" ]
 
 static_library("fdrm") {
   sources = [
     "core/include/fdrm/fx_crypt.h",
     "core/src/fdrm/crypto/fx_crypt.cpp",
     "core/src/fdrm/crypto/fx_crypt_aes.cpp",
@@ skipping 1444 matching lines @@
     "testing/fx_string_testhelpers.h",
   ]
   deps = [
     "//testing/gtest",
     ":pdfium"
   ]
   include_dirs = [ "." ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
 }