am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.

* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':