Merge "Necessary changes to build FreeType on Android" into staging-master