Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1

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

Change-Id: Icfa326458df77ddf8f9ff817e94008c9d6cf7e3e