[DO NOT MERGE] Fix the way FreeType headers are incldued. am: 5022fbe8a4 am: 73ff57d02c am: 5ee8e0cdc1 am: 4f87508a47  -s ours
am: 64aaa625fb

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

Change-Id: I2027fe121aa275739718553921adaab650944c59