am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1

* commit '596859549254a63c619fdc403e49e809751ab832':
  Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)