Cherry-pick one upstream patch am: 0f2d3fad34

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

Change-Id: I66cf541f14f14f1486b4df18dba6405a42aef029