Cherry-pick one upstream patch am: 45e5ce69f7 am: 9c14e45b8d am: 33bd8641c9

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

Change-Id: I8a8e526295c765e14e35898496d2fe2806a7784a