Merge "Eliminate submodules." am: f03f8ab3bf am: aa4ade7f4a

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

Change-Id: Id8814300b95b053da75f8e22e5e9bf13aba37989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>