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

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

Change-Id: I1ab27ea11e791610cfb4be1aebaf278bf9e53b42