Cherry-pick one upstream patch am: 8a51e41b7e am: 28daa7643b

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

Change-Id: Ic4891c507870baaf8ab2b4db9a3273e7fd68ece7