Reland "Split FreeType & FontConfig, step #1"

This reverts commit e37b6b19801693c54b47bfe42c1cb2f904fe65ef.

Reason for revert: Fixing the broken tests
Landed "RemoteStrike should use typeface Id from StrikeSpec"
https://skia.googlesource.com/skia.git/+/46d8175e88150ad4e870914c135a3baa72801b48

Original change's description:
> Revert "Split FreeType & FontConfig, step #1"
>
> This reverts commit f5f3648c25ecd00f3d4ce31e60611d8e372c1429.
>
> Reason for revert: Broke some tests
>
> Original change's description:
> > Split FreeType & FontConfig, step #1
> >
> > Change-Id: Ie2b30e222e6ca2685bc7b2c3281e8a660295f4fe
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/889684
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Reviewed-by: Ben Wagner <bungeman@google.com>
> > Commit-Queue: Julia Lavrova <jlavrova@google.com>
>
> Change-Id: Ib583d9329a96977fbe6b16c434e813bad40b9e33
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/894476
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

Change-Id: I9cb4cdf592d18d1a42348e07b76f2e4ba9c8c4ed
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/894776
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
2 files changed