Cherry-pick one upstream patch am: 90788a1c9c

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

Change-Id: Ib7f8ca4f83fe7712237913c436dd9bf081361a84