am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"

* commit 'f6c9c4204c2f8f86277d081112c9dd863ddaa778':
  Correct stride for drawing to cached glyph bitmap