Cherry-pick one upstream patch am: 8a51e41b7e am: 06cd86424b

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/freetype/+/12903060

Change-Id: I916d79b6e65cf842443838504a90dea9a788a128