am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)" into ics-mr1

* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
  Fix memory corruption issues in TextLayoutCache.  (DO NOT MERGE)