Cherry-pick one upstream patch am: 0f2d3fad34 am: 80e1ac40d1 am: 1c49113878

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

Change-Id: I2632e975a2bbbbcf6350f4199e5b839201c7c13d