Merge "DO NOT MERGE Update FreeType library to 2.4.7"