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

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

Change-Id: I7cd9b21eb1528a40552c23ab95f2e07c8062c93c