Cherry-pick one upstream patch am: 573e921c6d

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

Change-Id: I0427e517247f6e31a2671c24ef8adaede1cdab4a