Cherry pick the following two CLs from upstream am: b56d29a0a6 am: 8cf8db6118

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

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