Merge change 4829 into donut

* changes:
  Fixes #1926784. Setting android:ellipsize on an EditText now ellipsizes the hint.