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

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

Change-Id: I50ad2bebc7e3c39ee643050e0c14109da6755e43