Cherry-pick one upstream patch am: 8a51e41b7e

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

Change-Id: I85f2e04621fc5f6ceb8bf3d67420f01e84b61be2