am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev
automerge: be1ad50

* commit 'be1ad50b34e160c5d490d1165a590eb4c633d996':
  Fudge clipRect in TextView for extra cursor width