Cherry pick the following two CLs from upstream am: b56d29a0a6

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

Change-Id: Ia7f42a5c0e97519d349ffc2c32982aa79fe86e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>