am e6ab011b: Merge change Ib12bcb7f into eclair

Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-mr2

* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
  Support for fallback fonts in layoutlib.