[DO NOT MERGE] Fix the way FreeType headers are incldued. am: 5022fbe8a4
am: 73ff57d02c

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

Change-Id: I9d4151621c5365ac13510b47650ae31e1145547d