tree 0cfebd74708bcf6ffd93590c0529f72a88f7fe63
parent cc0de4ce4f01450fc28662f32860610f28fa14f7
parent a15ce23c360f8ea93b2b2d2efab70980d3e19423
author Seigo Nonaka <nona@google.com> 1605060458 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605060458 +0000

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

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

Change-Id: I4016dac925de8bd9f91bcee53b42258913d36235