Merge "Fixup Trusty build breakage dues to removed renderer clases" am: b04f211ab2 am: 56cbf4c94d am: add2b7605d

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

Change-Id: Ic82d5a473d645ab4e82abab9c2d752534c296e77