Android S Beta 3
Merge "DO NOT MERGE - Merge ab/7272582" am: 8208049745

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

Change-Id: I6eb1958535e12bf2bb6dfaafc5f423cb1ac28139