freetype + adobe cff

Change-Id: I9e180da68910c26b861fe6a9960b638b7056b5d4
Revert "Revert "Upgrade FreeType to 2.4.10""

This reverts commit 8ba9876bf2f31300cded47abc4296bd02977221e.
Manual merge of CM changes