am 9a5bda87: am be46d145: Revert "Fix for StaticLayout bug with ellipsized text"

* commit '9a5bda875f86b188b501ce7cf73810dd92288251':
  Revert "Fix for StaticLayout bug with ellipsized text"