Cherry-pick one upstream patch am: 8a51e41b7e am: 28daa7643b

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

Change-Id: I94a1bd8206f262b1476dc75749d6e36d83f8ada7