[DO NOT MERGE] Fix the way FreeType headers are incldued.
am: 209139b7a0  -s ours

* commit '209139b7a064ee5ff783d10efad4d04027c6b3d6':
  [DO NOT MERGE] Fix the way FreeType headers are incldued.