Merge changes from topic 'grapheme-dr1.5' into mnc-dr1.5-dev

* changes:
  Respect grapheme clusters in Layout#getOffsetForHorizontal.
  Fix: Cursor can be at an invalid offset in EditText.