Merge "Update FreeType to 2.10.4" am: 7258cd5a1c am: b7bdba3d5e am: 13f7dd14f0

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

Change-Id: If9f889ce421f5ca5730044ea7ef5129bf01d1850