Unify fontconfig source code so that one branch builds on both linux + android.
Merge pull request #3201 from glennw/fc-platform-fixup

Unify fontconfig source code so that one branch builds on both linux + android